1. 14 May, 2018 2 commits
    • Rajeshekar's avatar
      Merge branch 'master' into MT-43 · 8dfe7e43
      Rajeshekar authored
      Conflicts:
      	src/main/java/com/nisum/mytime/controller/UserController.java
      	src/main/java/com/nisum/mytime/service/UserService.java
      	src/main/java/com/nisum/mytime/service/UserServiceImpl.java
      8dfe7e43
    • Rajeshekar's avatar
      MT-45: Employment Type Full Time/Part Time · c0c90e95
      Rajeshekar authored
      MT-41: Update Designation while in Manage Employees
      MT-42: Active Employee : Capture if employee is active or inactive(left
      org). By default on emp creation,set active to true.
      MT-40: Capture Functional Group and show in Employee details and
      Dashboard
      c0c90e95
  2. 10 May, 2018 2 commits
  3. 09 May, 2018 2 commits
  4. 07 May, 2018 2 commits
  5. 17 Apr, 2018 2 commits
  6. 04 Jan, 2018 1 commit
  7. 02 Jan, 2018 1 commit
  8. 27 Dec, 2017 1 commit
  9. 11 Dec, 2017 1 commit
  10. 06 Dec, 2017 2 commits