Commit Graph
10832 Commits
Author SHA1 Message Date
wangyidong 0345d0e4fb * merge update sql to zentao.sql. 2018-03-21 13:13:52 +08:00
daitingting ee62c22030 * Adjust version. 2018-03-21 11:23:18 +08:00
daitingting fc4c03fce2 * Adjust default full blocks. 2018-03-21 11:20:18 +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
daitingting cd3971346f * Display future for future plan. 2018-03-21 09:23:58 +08:00
wumo 872821d830 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 09:14:10 +08:00
wangyidong 040137e110 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 08:56:58 +08:00
wangyidong 7ad7e91147 * finish task #3747. 2018-03-21 08:56:26 +08:00
daitingting 892103d854 * Add height for textarea. 2018-03-20 18:50:36 +08:00
wumo 53fa13226b * Add tips when build is empty. 2018-03-20 18:39:03 +08:00
daitingting f25154c98a * Fix closedBy and closedDate for closed project before. 2018-03-20 18:34:49 +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 44a6a843e0 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-20 17:58:59 +08:00
Catouse 29b3502d03 * improve style of elements witch has long text inside. 2018-03-20 17:58:39 +08:00
daitingting de741a4c68 * Get last productplan without future. 2018-03-20 17:24:56 +08:00
wangyidong 1e1a2ae026 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 17:17:55 +08:00
wangyidong bcf1a89305 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 17:15:36 +08:00
daitingting 3e3d7c30e4 * Adjust style for create and edit todo. 2018-03-20 17:14:49 +08:00
wangyidong dfe9ca2e60 * finish task #3748. 2018-03-20 17:07:07 +08:00
daitingting c4e167763f * Adjust codes. 2018-03-20 16:51:21 +08:00
daitingting 04b123ac7d * @assignedTo when object has assignedTo. 2018-03-20 15:09:33 +08:00
daitingting ca63164bc9 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-20 15:02:00 +08:00
daitingting 59b5cbcd22 * Add resolved and bugconfirmed action for @. 2018-03-20 15:01:06 +08:00
wumo c7823a04c2 * Filter invalid comment. 2018-03-20 14:21:20 +08:00
wumo 74e29a42a3 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 14:03:30 +08:00
wumo 72956d5910 * Adjust batch create style. 2018-03-20 13:59:46 +08:00
wangyidong 886153a0db * adjust for delete branch. 2018-03-20 13:11:53 +08:00
wangyidong 36b04eb6d5 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 10:45:14 +08:00
wangyidong b5f40d4ad1 * finish task #3742. 2018-03-20 10:44:49 +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
Catouse a0ab6272f1 * finish task #3725 and fix bug #1406. 2018-03-20 10:14:49 +08:00
wangyidong 1523479350 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 10:11:25 +08:00
wangyidong 1c2db4e95b * finish task #3740. 2018-03-20 10:10:23 +08:00
wumo cd918d09fd * Check the key of user when setting. 2018-03-20 10:00:30 +08:00
wumo a87465f453 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-19 18:39:15 +08:00
wumo 498a02e142 * Fix the bug of key column empty. 2018-03-19 18:36:19 +08:00
daitingting 3df140466f Merge pull request #21 from easysoft/origin/zentaopms_9.8
Origin/zentaopms 9.8
2018-03-19 18:34:07 +08:00
daitingting 4b938be75f Merge branch 'zentaopms_9.8' into origin/zentaopms_9.8 2018-03-19 18:33:51 +08:00
Catouse 6ca2173168 Merge branches 'zentaopms_9.8' and 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-19 17:13:20 +08:00
daitingting 2f5ac1ad32 * Adjust length checking. 2018-03-19 17:13:12 +08:00
Catouse 37dfcc7a26 * finish task #3712 and fix bug #1419. 2018-03-19 17:13:01 +08:00
wumo 90a2fa2f4a * Add the product line in batchedit page. 2018-03-19 16:57:25 +08:00
daitingting 7ff7bfd435 * Adjust task page for chilrenTask. 2018-03-19 16:54:29 +08:00
Catouse 9123dbb30c Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-19 16:30:57 +08:00
Catouse a28fbfca27 * finish task #3752 and fix bug #1339. 2018-03-19 16:30:23 +08:00
wumo 2ff47d30fb * Add the product line in batchedit page. 2018-03-19 16:23:17 +08:00
daitingting cab2a753af * Adjust pri. 2018-03-19 15:43:56 +08:00