Commit Graph
11002 Commits
Author SHA1 Message Date
JackWuLieHao 0fc0880c09 * adjust style 2018-04-04 17:19:45 +08:00
JackWuLieHao 6c9760c771 * adjust style 2018-04-04 17:02:49 +08:00
JackWuLieHao 4548d80a79 * adjust style 2018-04-04 16:55:39 +08:00
JackWuLieHao 70a956dcf5 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-04 16:47:24 +08:00
JackWuLieHao d50de9fd8f * Finish task 3797 2018-04-04 16:46:24 +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
JackWuLieHao 5a9bf28a9c Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-04 14:37:39 +08:00
JackWuLieHao e5b822276d * Finish bug #1486 #1502 2018-04-04 14:35:09 +08:00
wumo 69e065a803 * Add the unique key to team table. 2018-04-04 13:23:03 +08:00
wumo 0cdcc4b53b Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-04-04 13:15:17 +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
JackWuLieHao 50e3a3519f Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-03 16:03:29 +08:00
JackWuLieHao fc48a92729 * If entry-date is default,then hidden 2018-04-03 15:58:30 +08:00
wumo b13eac3b36 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-04-03 15:33:43 +08:00
wumo d3b4f05f70 * Hide the entry to manage product lines when exists product lines 2018-04-03 15:30:02 +08:00
JackWuLieHao 6dcfb832f0 * my-todo Priority and name plus title;
* user-edit     Adjust the location of the entry date
* user-profile  If the entry date is empty, do not display.
2018-04-03 15:05:20 +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 81dfc9c529 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-04-03 13:49:54 +08:00
daitingting fdda7345ce * Format codes. 2018-04-03 13:49:28 +08:00
wumo 984060278e Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-04-03 11:17:08 +08:00
wumo 7be59d3948 * Change the content of length prompt. 2018-04-03 11:15:22 +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