Sie sind auf Seite 1von 2

On branch master

Your branch is up-to-date with 'origin/master'.

MODIFICATION 1:

renamed: src/update2/org/cict/controller/subjects/SearchSubjectController.java ->


src/update2/org/c ict/controller/subjects/CheckInternship.java
deleted: src/update2/org/cict/layout/academicprogram/academic-program-home.css
deleted: src/update2/org/cict/layout/subjects/tableview.css

MODIFICATION 2:

deleted: cictems-rev.sql
modified: nbproject/project.properties
modified: src/org/cict/accountmanager/Recovery.fxml
modified: src/org/cict/accountmanager/RecoveryController.java
modified: src/org/cict/accountmanager/Register.fxml
modified: src/org/cict/accountmanager/RegisterController.java
modified: src/org/cict/accountmanager/faculty/FacultyInformation.java
modified: src/org/cict/accountmanager/faculty/FacultyMainController.java
modified: src/org/cict/accountmanager/faculty/FetchFacultyInfo.java
deleted: src/org/cict/accountmanager/faculty/adding-table.css
modified: src/org/cict/accountmanager/faculty/main-row.fxml
deleted: src/org/cict/accountmanager/src/images/Customer_32px.png
deleted: src/org/cict/accountmanager/src/images/Long Arrow Left_32px.png
modified: src/org/cict/accountmanager/src/images/Name_32px.png
modified: src/org/cict/accountmanager/src/images/Plus Math_32px.png
modified: src/org/cict/accountmanager/src/images/Save as_32px.png
deleted: src/org/cict/accountmanager/src/images/Trash_32px.png
modified: src/org/cict/authentication/LoginController.java
modified: src/org/cict/evaluation/encoder/MissingRecordController.java
modified: src/org/cict/evaluation/evaluator/PrintChecklist.java
modified: src/org/cict/evaluation/student/info/InfoStudentController.java
modified: src/org/cict/reports/ReportsDirectory.java
modified: src/org/cict/reports/checklist/ACT.java
modified: src/org/cict/reports/checklist/BITCT.java
modified: src/org/cict/reports/checklist/BSIT1112.java
modified: src/org/cict/reports/checklist/BSIT1516.java
modified: src/update/org/cict/controller/adding/subjectviewer/AddingSubjects.java
modified: src/update/org/cict/controller/home/Home.java
modified: src/update2/org/cict/controller/academicprogram/AcademicHome.java
modified: src/update2/org/cict/controller/academicprogram/AcademicProgramHome.java
modified: src/update2/org/cict/controller/academicprogram/AddNewProgramController.java
modified: src/update2/org/cict/controller/academicprogram/FetchAcademicPrograms.java
modified: src/update2/org/cict/controller/curriculum/ActualDataHistory.java
modified: src/update2/org/cict/controller/curriculum/AddNewCurriculumController.java
modified: src/update2/org/cict/controller/curriculum/CurriculumInformationController.java
modified: src/update2/org/cict/controller/curriculum/HistoryController.java
modified: src/update2/org/cict/controller/subjects/AddNewSubjectController.java
deleted: src/update2/org/cict/controller/subjects/CheckInternship.java
modified: src/update2/org/cict/controller/subjects/SubjectInformationController.java
modified: src/update2/org/cict/controller/subjects/SubjectPrerequisiteController.java
modified: src/update2/org/cict/controller/subjects/SubjectRepositoryController.java
modified: src/update2/org/cict/layout/academicprogram/academic-home.fxml
modified: src/update2/org/cict/layout/academicprogram/academic-program-home.fxml
modified: src/update2/org/cict/layout/academicprogram/add-acad-program.fxml
modified: src/update2/org/cict/layout/academicprogram/curriculum-row.fxml
modified: src/update2/org/cict/layout/academicprogram/program-row-extension.fxml
modified: src/update2/org/cict/layout/academicprogram/program-row.fxml
modified: src/update2/org/cict/layout/curriculum/actual-data-history.fxml
modified: src/update2/org/cict/layout/curriculum/actual-data.fxml
modified: src/update2/org/cict/layout/curriculum/add-curriculum.fxml
modified: src/update2/org/cict/layout/curriculum/curriculum-info.fxml
modified: src/update2/org/cict/layout/curriculum/eq-row.fxml
modified: src/update2/org/cict/layout/curriculum/history-row.fxml
modified: src/update2/org/cict/layout/curriculum/history.fxml
modified: src/update2/org/cict/layout/curriculum/row-semester.fxml
modified: src/update2/org/cict/layout/curriculum/row-subject.fxml
modified: src/update2/org/cict/layout/curriculum/subject-extension.fxml
modified: src/update2/org/cict/layout/subjects/add-new-subject.fxml
modified: src/update2/org/cict/layout/subjects/row-subject.fxml
modified: src/update2/org/cict/layout/subjects/search-subject-row.fxml
modified: src/update2/org/cict/layout/subjects/search-subject.fxml
modified: src/update2/org/cict/layout/subjects/subject-bank.fxml
modified: src/update2/org/cict/layout/subjects/subject-info-curriculum-row.fxml
modified: src/update2/org/cict/layout/subjects/subject-info.fxml
modified: src/update2/org/cict/layout/subjects/subject-prereq-row.fxml
modified: src/update2/org/cict/layout/subjects/subject-prereq.fxml
(UN ASSIGNED PACKAGE)
modified: src/update3/org/cict/layout/sectionmain/sectionHome.fxml

NEW FILES:

src/org/cict/accountmanager/faculty/FacultyInfoController.java
src/org/cict/accountmanager/faculty/layout/
src/org/cict/accountmanager/src/images/Account_96px.png
src/org/cict/accountmanager/src/images/Info_96px.png
src/org/cict/accountmanager/src/images/Long Arrow Left_64px.png
src/org/cict/accountmanager/src/images/Search_96px.png
src/org/cict/accountmanager/src/images/Unavailable_96px.png
src/org/cict/evaluation/encoder/MissingRecordController2.java
src/update2/org/cict/controller/subjects/SearchSubjectController.java
src/update2/org/cict/layout/metro-ui-table.css
src/update2/org/cict/layout/metro-ui.css

Das könnte Ihnen auch gefallen