Commit Graph
10975 Commits
Author SHA1 Message Date
daitingting fdda7345ce * Format codes. 2018-04-03 13:49:28 +08:00
daitingting 33e3711865 * Adjust version to 9.8.3. 2018-04-03 09:05:31 +08:00
daitingting 249fb13bb1 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-03 09:04:29 +08:00
daitingting 049b2fb3fc * Adjust language. 2018-04-03 09:03:57 +08:00
wumo 952b7d3bd8 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-04-02 17:36:02 +08:00
wumo d455deebab * Release the build of 9.8.3 2018-04-02 17:34:11 +08:00
daitingting 2eb983b3c2 * Compute status is delayed or not when project is not closed and done. 2018-04-02 16:52:44 +08:00
daitingting 2a595f5077 * Distinguish update url of english from chinese. 2018-04-02 16:10:40 +08:00
daitingting 45fa54c357 * Use replace instead of insert fot zt_team. 2018-04-02 15:00:11 +08:00
daitingting 99026d8de3 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-02 14:38:27 +08:00
daitingting a8a75a1556 * Fix bug for batchediting descs which has html tags. 2018-04-02 14:36:02 +08:00
JackWuLieHao 8bf55fdd63 * Finish task 3786 2018-04-02 14:28:15 +08:00
JackWuLieHao 204afb448a Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-02 12:01:09 +08:00
JackWuLieHao d764dc90de * Finish task #3797 2018-04-02 11:59:20 +08:00
daitingting 682fdff83d Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-02 11:29:27 +08:00
daitingting 65b442dcb1 * Fix bug for closed status, bug#1489,#1495,#1497. 2018-04-02 11:25:48 +08:00
wumo f004ef4409 * Make the rights of task clear. 2018-04-02 09:40:14 +08:00
daitingting e6aaf894a6 * Adjust codes. 2018-03-30 15:59:24 +08:00
daitingting 2fa7aa63b3 * Add title for select options.
* Set wrap for options over width.
2018-03-30 14:42:11 +08:00
daitingting 1a541d715b Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-30 14:41:13 +08:00
daitingting cac07cddc1 * Format codes. 2018-03-30 14:40:52 +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 d862e2698d Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-30 14:19:20 +08:00
daitingting b76b50e22f * Add ditto when module is ditto. 2018-03-30 14:18:54 +08:00
JackWuLieHao 288b985be6 * Finish Task #3786 2018-03-30 13:35:32 +08:00
daitingting 959dfe94b8 * Optimize codes. 2018-03-30 11:20:48 +08:00
daitingting 9c2e3c326b * Remove useless codes. 2018-03-30 11:07:26 +08:00
daitingting 070454933b * Compatible extension if there is a object to transfer story. 2018-03-30 10:48:16 +08:00
daitingting ad7cfe467e * Adjust codes. 2018-03-30 10:15:48 +08:00
daitingting 5e37928be5 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 16:58:25 +08:00
daitingting 0c9e7a58ff * Compatible extension if there is a object to transfer bug. 2018-03-29 16:56:22 +08:00
JackWuLieHao 5c6affa5f8 * Finish task #3790 2018-03-29 16:38:39 +08:00
JackWuLieHao 8e8c69eb85 * Finish task #3793 2018-03-29 16:22:29 +08:00
JackWuLieHao 55c57079df * Finish tash #3797 2018-03-29 16:17:09 +08:00
JackWuLieHao 8de3077126 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-29 15:57:06 +08:00
JackWuLieHao d7e1b30bd9 * Finish task #3793 2018-03-29 15:55:46 +08:00
wumo cf41ca19ea Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-29 15:53:09 +08:00
wumo f94e93a593 * Add the entry to manage product lines. 2018-03-29 15:52:43 +08:00
wumo 4d59bf7f42 * Add the entry to manage product lines. 2018-03-29 15:43:30 +08:00
wangyidong 8eccd30f45 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-29 15:40:29 +08:00
wangyidong 65d8752b5e * fix for import case in testsuite. 2018-03-29 15:39:53 +08:00
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