debug flagging
Timelog update datetime format
merge conflicts with leo
merge conflicts with olive
Update Timelog View for HR(PopupSearch), bug fix
Timelog remove bugs for viewing and flagging
Debug/merge conflicts
Debug/merge conflicts with olive
Update ViewTimelog jsp
Update Viewtimelog front-end
Merge with olive
Update timelog backend
update TimeIn and out Dao: transfer method that should be in service, update jsp
merge conflict in timelogging with leo
Merge commit 'refs/merge-requests/7' of git.dev.novare.com.hk:tempoplus/tempoplus into merge-requests/7
Olive Merge Request 9
Merge Request 9 Commit 2
Updates on Biometrics, Employees, Timesheets
Ernest's Mail Module MR-11
Jeff's Modules