Commit Graph
10933 Commits
Author SHA1 Message Date
JackWuLieHao 960ec7c84c * Finish task #3797 2018-03-29 15:39:14 +08:00
JackWuLieHao 408152f2f0 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 13:44:27 +08:00
JackWuLieHao 77ed3e4dec *Add the user add, edit, and view the details of the page without the
*date of hire display
2018-03-29 13:42:12 +08:00
JackWuLieHao 34e25dc140 *Repair can not be imported due to a single space in the code 2018-03-29 13:37:05 +08:00
JackWuLieHao 893fef2eaf * international version of the page, column width less 2018-03-29 13:34:44 +08:00
JackWuLieHao 48c255f236 * Modify the installed button style 2018-03-29 13:31:24 +08:00
daitingting a45b147781 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 13:24:45 +08:00
daitingting 7719686ae2 * Adjust codes. 2018-03-29 13:24:26 +08:00
JackWuLieHao f5a09e9558 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 11:25:02 +08:00
JackWuLieHao 2d9221beca *Add user creation, edit, and view the details of the page without the date of entry display 2018-03-29 11:18:33 +08:00
wumo ea1c4e9f55 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-29 11:11:35 +08:00
wumo 5f76edbe3b * Fix the bug of download link not display. 2018-03-29 11:10:54 +08:00
daitingting b868c77f83 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 09:44:12 +08:00
daitingting 8448dedf53 * Add primary key for zt_team. 2018-03-29 09:43:53 +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 f59975cbc4 * Set default plan as empty select. 2018-03-28 16:48:11 +08:00
daitingting 386add7076 * Check exported tasks has children or not. 2018-03-28 16:01:44 +08:00
daitingting 97e7d97cb5 * Remove useless codes. 2018-03-28 15:59:31 +08:00
daitingting dc06156360 * Adjust condition for taskonlyCondition. 2018-03-28 15:57:31 +08:00
daitingting 3e7af31e91 * Adjust style for it. 2018-03-28 13:44:35 +08:00
daitingting f05fbc988f Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-28 13:21:47 +08:00
daitingting 4058c58ca9 * Update time of task when edit team time or record estimate. 2018-03-28 13:19:36 +08:00
wumo 14db58abf7 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-28 11:17:58 +08:00
wumo 8145e5d9ee * Modify the prompt of pruduct code when create product. 2018-03-28 11:15:55 +08:00
daitingting 533c1d4013 * Format codes. 2018-03-28 09:36:46 +08:00
daitingting ff510f9c24 * Then plan can link with bugs that has been linked with other plans. 2018-03-28 09:34:44 +08:00
daitingting 69a75b1d17 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-27 14:46:53 +08:00
daitingting 8975712326 * Adjust style. 2018-03-27 14:46:37 +08:00
wumo 22e5223158 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-27 14:33:16 +08:00
wangyidong bafde6b274 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-27 14:23:40 +08:00
wangyidong 4d8984eeb5 * adjust for upgrade. 2018-03-27 14:23:19 +08:00
daitingting 7f520b741d Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-27 10:25:17 +08:00
daitingting 3b7afb5483 * Add condition for set function. 2018-03-27 10:24:56 +08:00
wumo 48b97ea292 * optimize the notes. 2018-03-26 15:33:46 +08:00
wumo ff19e33fd0 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-26 09:12:22 +08:00
wumo 24f28c0c1c * Fix the error time of changelog. 2018-03-26 09:11:16 +08:00
wangyidong a4b6765a3b * adjust for zh-tw lang. zentaopms_9.8.2_20180326 2018-03-26 09:06:19 +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 74738607aa * adjust code for upgrade. 2018-03-26 08:38:28 +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 6c7e587b20 * fix for deleted product. 2018-03-23 14:10:13 +08:00
wangyidong 55b8bebc83 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-23 13:34:20 +08:00
wangyidong d02f8b2ee2 * fix for update parent task status. 2018-03-23 13:33:54 +08:00