- 16 Jun, 2019 7 commits
-
-
Phạm Duy Phi authored -
Phạm Duy Phi authored
# Conflicts: # pom.xml # src/main/resources/public/general.html # src/main/resources/public/index.html # src/main/resources/public/js/app.js # src/main/resources/public/layout/layout1.html # src/main/resources/public/layout/layout2.html # src/main/resources/public/pages/leaveform/leaveForm.html # src/main/resources/public/pages/timesheet/timeSheet.html # src/main/resources/public/pages/timesheet/timeSheetController.js # src/main/resources/public/pages/timesheet/timesheet.html # src/main/resources/public/pages/timesheet/timesheetController.js
-
Phạm Duy Phi authored
-
https://git.myitsol.com/hieunv/qlns_n01Phạm Duy Phi authored
# Conflicts: # pom.xml # src/main/resources/public/index.html # src/main/resources/public/pages/timesheet/timeSheetController.js
-
Phạm Duy Phi authored
-
đinh thị đầm authored
# Conflicts: # pom.xml # src/main/resources/public/pages/homepage/catagoriManagements.html # src/main/resources/public/pages/homepage/homeController.js # src/main/resources/public/pages/homepage/homepage.html # src/main/resources/public/pages/homepage/newsManagements.html # src/main/resources/public/pages/leaveform/leaveForm.html # src/main/resources/public/pages/leaveform/leaveFormController.js # src/main/resources/public/pages/leaveform/leaveFormDetail.html # src/main/resources/public/pages/leaveform/leaveFormDetailController.js # src/main/resources/public/pages/project/groupproject/groupProjectAddView.html # src/main/resources/public/pages/project/groupproject/groupProjectController.js # src/main/resources/public/pages/project/groupproject/groupProjectEditView.html # src/main/resources/public/pages/project/groupproject/groupProjectView.html # src/main/resources/public/pages/project/project/projectAddViews.html # src/main/resources/public/pages/project/project/projectController.js # src/main/resources/public/pages/project/project/projectEditViews.html # src/main/resources/public/pages/project/project/projectListViews.html # src/main/resources/public/pages/timesheet/timeSheetController.js # src/main/resources/public/pages/timesheet/timeSheetDetailController.js # src/main/resources/public/pages/timesheet/timesheet.html
-
đinh thị đầm authored
-
- 15 Jun, 2019 13 commits
-
-
đinh thị đầm authored
-
Phạm Duy Phi authored
# Conflicts: # pom.xml # src/main/resources/public/index.html # src/main/resources/public/js/app.js # src/main/resources/public/widgets.html
-
https://git.myitsol.com/hieunv/qlns_n01Phạm Duy Phi authored
# Conflicts: # pom.xml # src/main/resources/public/index.html # src/main/resources/public/js/app.js
-
Phạm Duy Phi authored
# Conflicts: # src/main/resources/public/index.html # src/main/resources/public/js/angular.js # src/main/resources/public/js/app.js # src/main/resources/public/pages/timesheet/timeSheetController.js
-
đinh thị đầm authored
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
-
https://git.myitsol.com/hieunv/qlns_n01Phạm Duy Phi authored
# Conflicts: # src/main/resources/public/index.html # src/main/resources/public/js/app.js
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
-
đinh thị đầm authored
# Conflicts: # src/main/java/com/itsol/quantrivanphong/QuantrivanphongApplication.java # src/main/java/com/itsol/quantrivanphong/manager/employee/controller/EmployeeController.java # src/main/resources/application.properties # src/main/resources/public/css/style.css # src/main/resources/public/index.html # src/main/resources/public/js/angular.min.js # src/main/resources/public/js/app.js # src/main/resources/public/layout/layout1.html # src/main/resources/public/layout/layout2.html # src/main/resources/public/layout/layout3.html # src/main/resources/public/pages/employee/employeeController.js # src/main/resources/public/pages/timesheet/timesheetController.js
-
đinh thị đầm authored
-
đinh thị đầm authored
-
- 14 Jun, 2019 11 commits
-
-
Phạm Duy Phi authored
-
https://git.myitsol.com/hieunv/qlns_n01Nguyen Loc authored
# Conflicts: # pom.xml # src/main/resources/application.properties # src/main/resources/public/index.html # src/main/resources/public/js/angular-resource.js # src/main/resources/public/js/app.js # src/main/resources/public/layout/layout2.html # src/main/resources/public/layout/layout3.html
-
Nguyen Loc authored
-
đinh thị đầm authored
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
# Conflicts: # src/main/resources/application.properties # src/main/resources/public/index.html # src/main/resources/public/js/app.js
-
https://git.myitsol.com/hieunv/qlns_n01Phạm Duy Phi authored
# Conflicts: # src/main/resources/application.properties # src/main/resources/public/index.html # src/main/resources/public/js/app.js
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
-
Phạm Duy Phi authored
-
- 13 Jun, 2019 4 commits
-
-
đinh thị đầm authored
-
đinh thị đầm authored
-
Phạm Duy Phi authored
# Conflicts: # src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java # src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java # src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java # src/main/resources/application.properties # src/main/resources/public/index.html # src/main/resources/public/js/app.js # src/main/resources/public/pages/timesheet/timesheet.html # src/main/resources/public/pages/timesheet/timesheetController.js
-
https://git.myitsol.com/hieunv/qlns_n01Phạm Duy Phi authored
# Conflicts: # src/main/java/com/itsol/quantrivanphong/manager/reportdetail/bussiness/ReportProjectBussiness.java # src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java # src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java # src/main/java/com/itsol/quantrivanphong/report/timesheet/dto/TimeSheetDTO.java # src/main/resources/application.properties
-
- 12 Jun, 2019 3 commits
-
-
đinh thị đầm authored
-
phùng văn dung authored
# Conflicts: # src/main/resources/public/index.html # src/main/resources/public/js/app.js
-
phùng văn dung authored
-
- 11 Jun, 2019 2 commits
-
-
đinh thị đầm authored
-
đinh thị đầm authored
-
