Commit Graph

400 Commits

Author SHA1 Message Date
daitingting
f4b783f0ca * Optimize the order for condition of 'where'. 2018-04-03 13:52:28 +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
45fa54c357 * Use replace instead of insert fot zt_team. 2018-04-02 15:00:11 +08:00
daitingting
a8a75a1556 * Fix bug for batchediting descs which has html tags. 2018-04-02 14:36:02 +08:00
daitingting
65b442dcb1 * Fix bug for closed status, bug#1489,#1495,#1497. 2018-04-02 11:25:48 +08:00
daitingting
386add7076 * Check exported tasks has children or not. 2018-03-28 16:01:44 +08:00
wangyidong
6c7e587b20 * fix for deleted product. 2018-03-23 14:10:13 +08:00
wangyidong
4d475eef59 * fix error for deleted branch in link story. 2018-03-22 15:11:52 +08:00
daitingting
c8bb6b6726 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-20 18:03:29 +08:00
daitingting
def66979e1 * Project can not be delayed when it has been closed. 2018-03-20 18:01:58 +08:00
Catouse
29b3502d03 * improve style of elements witch has long text inside. 2018-03-20 17:58:39 +08:00
daitingting
4b938be75f Merge branch 'zentaopms_9.8' into origin/zentaopms_9.8 2018-03-19 18:33:51 +08:00
wangyidong
7d72b791f1 * adjust for kanban. 2018-03-19 11:24:00 +08:00
wangyidong
9eb0dcc84e * code for task #3728. 2018-03-16 17:33:38 +08:00
wangyidong
ef781fae09 * finish task #3728. 2018-03-16 16:32:55 +08:00
wangyidong
809c8d5eb2 * finish task #3727. 2018-03-16 15:51:14 +08:00
wangyidong
3a2cb30741 * finish task #3702. 2018-03-16 11:36:11 +08:00
daitingting
35e3a0ea38 * Adjust status when close project. 2018-03-16 09:35:20 +08:00
wangyidong
fb8b43ea4b * finish task #3726. 2018-03-15 11:19:26 +08:00
滔哥
d7a829325c * Fix Bug. 2018-01-16 14:59:22 +08:00
滔哥
f07d87e616 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-16 11:09:43 +08:00
滔哥
2d13064e7e * Fix Bug#1388. 2018-01-16 11:09:39 +08:00
wangyidong
80ed7e727f * fix bug. 2018-01-16 10:47:33 +08:00
滔哥
1e12da117f * Finish Task#3576. 2018-01-10 16:43:17 +08:00
滔哥
13458b1b38 * Task#3576 2018-01-10 11:25:08 +08:00
滔哥
70f18180d2 * Task#3576 2018-01-10 08:33:18 +08:00
滔哥
cbf08b828a * Task#3561 2017-12-28 18:03:48 +08:00
wangyidong
d09eabbad8 * fix bug and delete test code. 2017-12-26 16:40:18 +08:00
滔哥
0c8e120075 * Fix bug#1348 2017-12-20 10:51:22 +08:00
滔哥
4830880ebe * Fix tips. 2017-12-19 17:02:38 +08:00
滔哥
42e4aec31f * Fix Bug 2017-12-19 15:01:10 +08:00
滔哥
f7080930b1 * Fix Bug#1328 2017-12-19 14:19:33 +08:00
wangyidong
5057abf5d8 * finish task #3427. 2017-12-14 11:16:03 +08:00
滔哥
7449b93402 * Task #3465 2017-12-13 19:17:29 +08:00
wangyidong
54afa9bce1 * fix bug. 2017-12-11 14:37:00 +08:00
滔哥
95040eb64f * Fix task bug 2017-12-05 22:00:47 +08:00
滔哥
8663227af1 * Fix task bug 2017-12-05 21:53:18 +08:00
wangyidong
29f7e91a9f * fix bug #1290. 2017-12-01 14:00:21 +08:00
wangyidong
a8fb159310 * fix error. 2017-11-29 14:47:40 +08:00
wangyidong
6957ae1681 * fix bug #1271. 2017-11-10 10:34:13 +08:00
wangyidong
528c6934ee Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 13:46:49 +08:00
wangyidong
7dd879c8d6 * finish task #3334,3323. 2017-11-09 13:46:10 +08:00
滔哥
e627415f6c * Fix bug 2017-11-09 13:39:41 +08:00
wangyidong
ef1291a06c * fix error. 2017-11-03 14:17:58 +08:00
wangyidong
99bd7ed909 * finish task #3289. 2017-11-02 14:28:02 +08:00
wangyidong
d4dd502c31 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-01 13:28:14 +08:00
wangyidong
13c0df7fff Finish task#3238 项目挂起再激活的时候给用户选择是否顺延任务起止时间,cost:3 left:0 2017-11-01 09:39:16 +08:00
滔哥
3b246f43f1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 21:15:18 +08:00
wangyidong
f0914224f8 * adjust for task #3239. 2017-10-31 13:15:10 +08:00
wangyidong
e9ac65b7dc * fix for task #3239. 2017-10-31 11:13:40 +08:00