Skip to content

Q
QLNS_N01
Switch branch/tag
  1. 17 Jun, 2019 4 commits
  3. 16 Jun, 2019 12 commits
    • ='s avatar
      Merge branch 'master' into hieunv · e3332b54
      = authored
      e3332b54
    • ='s avatar
      new · ba838b65
      = authored
      ba838b65
    • ='s avatar
      new · f38d811c
      = authored
      f38d811c
    • ='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
    • Phạm Duy Phi's avatar
      Merge branch 'dungpv' of https://git.myitsol.com/hieunv/qlns_n01 · 9bd95817
      Phạm Duy Phi authored 
      # Conflicts:
#	pom.xml
#	src/main/java/com/itsol/quantrivanphong/QuantrivanphongApplication.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeRepositoryImpl.java
#	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
      9bd95817
    • phùng văn dung's avatar
      update 15/06/2019 · 592a9cde
      phùng văn dung authored
      592a9cde
    • Phạm Duy Phi's avatar
      no message · 50e259b2
      Phạm Duy Phi authored
      50e259b2
    • Phạm Duy Phi's avatar
      Merge branch 'master' of https://git.myitsol.com/hieunv/qlns_n01 · c489c098
      Phạm Duy Phi authored 
      # Conflicts:
#	pom.xml
#	src/main/resources/public/index.html
#	src/main/resources/public/pages/timesheet/timeSheetController.js
      c489c098
    • đ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
  5. 15 Jun, 2019 9 commits
  7. 14 Jun, 2019 11 commits
  9. 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