Skip to content

Q
QLNS_N01
Switch branch/tag
  1. 17 Jun, 2019 12 commits
    • Phạm Duy Phi's avatar
      no message · 3cff4d6d
      Phạm Duy Phi authored
      3cff4d6d
    • Phạm Duy Phi's avatar
      no message · c853249a
      Phạm Duy Phi authored
      c853249a
    • Phạm Duy Phi's avatar
      no message · cf8409dc
      Phạm Duy Phi authored
      cf8409dc
    • Phạm Duy Phi's avatar
      Merge branch 'dinhdam' of https://git.myitsol.com/hieunv/qlns_n01 · 1e2beb60
      Phạm Duy Phi authored 
      # Conflicts:
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/CatalogiController.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/repository/CatalogiRepository.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/repository/NewsRepository.java
#	src/main/java/com/itsol/quantrivanphong/access/login/dto/EmployeeDTO.java
#	src/main/java/com/itsol/quantrivanphong/access/register/bussiness/EmailBussiness.java
#	src/main/java/com/itsol/quantrivanphong/access/register/controller/RegisterController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/controller/ProjectController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/dto/ProjectDTO.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/repository/ProjectRepository.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/ProjectGroupUtils.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/controller/ProjectGroupController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/dto/ProjectGroupDTO.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/repository/ProjectGroupRepository.java
#	src/main/java/com/itsol/quantrivanphong/model/Catalogi.java
#	src/main/java/com/itsol/quantrivanphong/model/Eproject.java
#	src/main/java/com/itsol/quantrivanphong/model/Issues.java
#	src/main/java/com/itsol/quantrivanphong/model/LeaveType.java
#	src/main/java/com/itsol/quantrivanphong/model/News.java
#	src/main/java/com/itsol/quantrivanphong/model/Project.java
#	src/main/java/com/itsol/quantrivanphong/report/issue/repository/IssueRepository.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/dto/LeaveFormDTO.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/repository/LeaveFormRepository.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/java/com/itsol/quantrivanphong/report/timesheet/repository/EProjectRepository.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java
#	src/main/resources/public/css/style.css
#	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/employee/createEmployee.html
#	src/main/resources/public/pages/homepage/HomeService.js
#	src/main/resources/public/pages/homepage/newsManagements.html
#	src/main/resources/public/pages/issue/IssueAdd.html
#	src/main/resources/public/pages/issue/IssueController.js
#	src/main/resources/public/pages/issue/IssueDetailViews.html
#	src/main/resources/public/pages/issue/IssueView.html
#	src/main/resources/public/pages/issue/IssuesDetailController.js
#	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/groupProjectEditView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectViewController.js
#	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/project/project/projectViewController.js
#	src/main/resources/public/pages/report/reportController.js
#	src/main/resources/public/pages/timesheet/timeSheetController.js
#	src/main/resources/public/pages/timesheet/timeSheetDetail.html
#	src/main/resources/public/pages/timesheet/timeSheetDetailController.js
#	src/main/resources/public/pages/timesheet/timesheet.html
      1e2beb60
    • Phạm Duy Phi's avatar
      no message · cca03edb
      Phạm Duy Phi authored
      cca03edb
    • Phạm Duy Phi's avatar
      Merge branch 'master' of https://git.myitsol.com/hieunv/qlns_n01 · 79a350ba
      Phạm Duy Phi authored 
      # Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/common/css/all.css
#	src/main/resources/public/common/css/bootstrap-combined.min.css
#	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/layout1.html
      79a350ba
    • Phạm Duy Phi's avatar
      no message · ca7526a5
      Phạm Duy Phi authored
      ca7526a5
    • Phạm Duy Phi's avatar
      no message · 4d088f43
      Phạm Duy Phi authored
      4d088f43
    • đinh thị đầm's avatar
      update new · a54be6c7
      đinh thị đầm authored
      a54be6c7
    • đinh thị đầm's avatar
      update new · f75d21a0
      đinh thị đầm authored
      f75d21a0
    • đinh thị đầm's avatar
      new page · 5a3250a9
      đinh thị đầm authored
      5a3250a9
    • đinh thị đầm's avatar
      new page · 8b8c4034
      đinh thị đầm authored
      8b8c4034
  3. 16 Jun, 2019 15 commits
    • đinh thị đầm's avatar
      t · 19c5ecee
      đinh thị đầm authored
      19c5ecee
    • đinh thị đầm's avatar
      t · 495ed4ca
      đinh thị đầm authored
      495ed4ca
    • đinh thị đầm's avatar
      t · 4755371a
      đinh thị đầm authored
      4755371a
    • ='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 4 commits