Skip to content

Q
QLNS_N01
Switch branch/tag
  1. 16 Jun, 2019 5 commits
    • ='s avatar
      Merge branch 'master' into hieunv · 1d7bfc48
      = authored 
      # Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
#	src/main/resources/public/layout/layout3.html
      1d7bfc48
    • ='s avatar
      new · 8647db25
      = authored
      8647db25
    • ='s avatar
      new · c5a6bd0a
      = authored
      c5a6bd0a
    • đinh thị đầm's avatar
      Merge branch 'dinhdam' · fcb3554c
      đ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
      fcb3554c
    • đinh thị đầm's avatar
      t · fcb6432d
      đinh thị đầm authored
      fcb6432d
  3. 15 Jun, 2019 5 commits
    • đinh thị đầm's avatar
      t · 7ee28f85
      đinh thị đầm authored
      7ee28f85
    • đinh thị đầm's avatar
      paging · 049511c3
      đinh thị đầm authored
      049511c3
    • đinh thị đầm's avatar
      Merge branch 'dinhdam' · 14cbe76c
      đ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
      14cbe76c
    • đinh thị đầm's avatar
      paging · ae386dd1
      đinh thị đầm authored
      ae386dd1
    • đinh thị đầm's avatar
      paging · d28f629e
      đinh thị đầm authored
      d28f629e
  5. 14 Jun, 2019 10 commits
  7. 13 Jun, 2019 4 commits
    • đinh thị đầm's avatar
      paging · 3b48a118
      đinh thị đầm authored
      3b48a118
    • đinh thị đầm's avatar
      commit · 0ea7a902
      đinh thị đầm authored
      0ea7a902
    • Phạm Duy Phi's avatar
      Merge branch 'master' into phipham · a98ad627
      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
      a98ad627
    • Phạm Duy Phi's avatar
      Merge branch 'master' of https://git.myitsol.com/hieunv/qlns_n01 · d09d0eff
      Phạ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
      d09d0eff
  9. 12 Jun, 2019 4 commits
  11. 11 Jun, 2019 3 commits
  13. 09 Jun, 2019 3 commits
  15. 07 Jun, 2019 6 commits