Skip to content

Q
QLNS_N01
Switch branch/tag
  1. 15 Jun, 2019 1 commit
  3. 14 Jun, 2019 7 commits
  5. 13 Jun, 2019 2 commits
    • 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
  7. 12 Jun, 2019 2 commits
  9. 09 Jun, 2019 1 commit
  11. 07 Jun, 2019 15 commits
  13. 06 Jun, 2019 9 commits
  15. 05 Jun, 2019 3 commits
    • đinh thị đầm's avatar
      commit · e7b14bbb
      đinh thị đầm authored
      e7b14bbb
    • ='s avatar
      Merge branch 'master' into hieunv · 7f1278ac
      = authored 
      # Conflicts:
#	src/main/java/com/itsol/quantrivanphong/exception/InputException.java
#	src/main/java/com/itsol/quantrivanphong/model/TimeSheet.java
#	src/main/java/com/itsol/quantrivanphong/repository/EmployeeRepository.java
#	src/main/resources/application.properties
      7f1278ac
    • Phạm Duy Phi's avatar
      no message · 480f4a72
      Phạm Duy Phi authored
      480f4a72