Commit Graph
2523 Commits
Author SHA1 Message Date
wangyidong 9f80543823 * adjust for ux style. 2018-04-08 11:29:53 +08:00
daitingting 7582aeeaf0 * Add language. 2018-04-04 16:19:05 +08:00
daitingting e9f20b5946 * Format codes. 2018-04-04 16:14:21 +08:00
daitingting ba57271489 * Adjust order for call computeWorkingHours function. 2018-04-04 15:38:52 +08:00
daitingting c43943b73d * Adjust codes for compute hours for multiple tasks. 2018-04-04 15:25:51 +08:00
daitingting 19f7c11b00 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-04 14:40:00 +08:00
daitingting 321005e8ad * Compute hours for multiple tasks. 2018-04-04 14:38:57 +08:00
wangyidong 5105af3d89 * adjust for show history in view page. 2018-04-04 13:51:45 +08:00
wumo 58159b3d42 * Adjust the style of the prompt in multi-user task
* Add unique key to team table.
2018-04-04 13:13:09 +08:00
wangyidong 2ecdc58a3d * finish task #3769. 2018-04-04 09:39:01 +08:00
wumo 88a06cc0e0 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-04-03 14:04:55 +08:00
wumo 392cc65ae1 * Modify the prompt of start or restart in multi-user task. 2018-04-03 14:01:54 +08:00
daitingting f4b783f0ca * Optimize the order for condition of 'where'. 2018-04-03 13:52:28 +08:00
daitingting 049b2fb3fc * Adjust language. 2018-04-03 09:03:57 +08:00
wumo f004ef4409 * Make the rights of task clear. 2018-04-02 09:40:14 +08:00
wumo 0930835923 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-30 14:38:39 +08:00
wumo 69255bb181 * Update the status of parent tasks after batch create tasks. 2018-03-30 14:35:20 +08:00
daitingting b76b50e22f * Add ditto when module is ditto. 2018-03-30 14:18:54 +08:00
daitingting 959dfe94b8 * Optimize codes. 2018-03-30 11:20:48 +08:00
wumo 14217d6ae8 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-29 09:15:30 +08:00
wumo cb06b23801 * Modify the right of start. 2018-03-29 09:14:52 +08:00
JackWuLieHao c58aa3f02f Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-28 20:42:42 +08:00
JackWuLieHao 44d35beb61 * Modify the name of team. 2018-03-28 20:41:42 +08:00
wumo 1874f441c4 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-28 20:31:57 +08:00
wumo 558bd8fc9f * Modify the rights of restart in multi-user task. 2018-03-28 20:30:48 +08:00
daitingting 386add7076 * Check exported tasks has children or not. 2018-03-28 16:01:44 +08:00
daitingting dc06156360 * Adjust condition for taskonlyCondition. 2018-03-28 15:57:31 +08:00
daitingting 4058c58ca9 * Update time of task when edit team time or record estimate. 2018-03-28 13:19:36 +08:00
wumo 4df677f7bd Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-26 09:02:12 +08:00
wumo 07fa914150 * Differentiate batch creation tasks and subtasks. 2018-03-26 09:00:31 +08:00
wangyidong 7e82a431df Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 16:15:00 +08:00
wangyidong 3cc37dd724 * adjust for delete parent task with child tasks. 2018-03-23 16:14:16 +08:00
wangyidong d02f8b2ee2 * fix for update parent task status. 2018-03-23 13:33:54 +08:00
wangyidong 5bb0c038f2 * code for task #3752. 2018-03-23 11:13:16 +08:00
wangyidong b996e427f0 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 10:09:11 +08:00
wangyidong 96aef84f2c * adjust for update parent task status. 2018-03-23 10:08:44 +08:00
wumo a8e8c79660 * Adjust the style. 2018-03-23 05:48:24 +08:00
wumo bc9224a959 * Limit the width of parent title. 2018-03-23 05:34:34 +08:00
wumo 62ccee6316 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 04:12:09 +08:00
wumo 1779bdeedc * Change the object of assigned to. 2018-03-23 00:48:54 +08:00
wumo e9d1a804c4 * Add parent title when batch create children task. 2018-03-22 23:18:28 +08:00
wangyidong 3027a4fd3b * adjust for team padding in modal. 2018-03-22 15:28:50 +08:00
wangyidong fb223a3bd7 * adjust for check has custom pri. 2018-03-22 14:29:27 +08:00
wangyidong 6dd688f3b7 * adjust for batch create. 2018-03-21 15:01:57 +08:00
wangyidong 714c580396 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 09:49:39 +08:00
wangyidong 9e6348b10e * code for child task. 2018-03-21 09:49:00 +08:00
daitingting b40e2bb9ea * Add tw language. 2018-03-21 09:30:47 +08:00
wangyidong 7ad7e91147 * finish task #3747. 2018-03-21 08:56:26 +08:00
wangyidong dfe9ca2e60 * finish task #3748. 2018-03-20 17:07:07 +08:00
Catouse 5ca4cb2559 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-20 10:29:48 +08:00