Commit Graph
747 Commits
Author SHA1 Message Date
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
tianshujie98 32444c9564 * Finish task #7990. 2020-09-18 13:11:14 +08:00
tianshujie98 2f12591e13 * Finish task #7990. 2020-09-18 11:38:03 +08:00
z f4bdb1e553 * fix bug for copy task. 2020-09-08 13:23:22 +08:00
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z ba32604be6 * fix for flow. 2020-08-31 15:17:40 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
holan20180123 fb15224b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-13 13:53:57 +08:00
holan20180123 4ae5a26771 * Fix bug #3364. 2020-08-13 13:51:34 +08:00
tianshujie98 f3c3ad3647 * Fix bug #2577. 2020-08-13 09:35:22 +08:00
holan20180123 29a2c25ef1 * Fix bug #3334. 2020-08-12 08:15:40 +08:00
tianshujie98 ff920c7d2d * Fix bug #3293. 2020-08-11 14:27:35 +08:00
z 23fac7fee6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-10 13:42:06 +08:00
tianshujie98 6489d03921 * Fix bug #3293. 2020-08-10 13:40:47 +08:00
z f25c68666d Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-10 13:38:06 +08:00
tianshujie98 29bc6f6df5 * Fix Bug #3293. 2020-08-10 13:30:43 +08:00
z cc5679a475 * revert code for create task. 2020-08-10 11:11:37 +08:00
tianshujie98 b38e6d0cf6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:33:29 +08:00
holan20180123 3eb3fcce02 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-07 17:31:57 +08:00
holan20180123 28af4d63da * Finish task #7613. 2020-08-07 17:29:16 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 c411761142 * Finish task #7617,7615. 2020-08-07 16:59:44 +08:00
z 4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
z f3a5fc4ef9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 17:22:21 +08:00
z d1d918334a * fix bug #3337. 2020-08-06 17:21:19 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
tianshujie98 7dc09c5374 * Finish task #7584. 2020-08-05 09:29:53 +08:00
holan20180123 c351b21b76 * Finish task #7571. 2020-07-31 15:53:40 +08:00
sgm0422 4494e97639 * Fix details. 2020-07-22 13:52:46 +08:00
sgm0422 9358aa343b * Finish task #1087. 2020-07-20 15:34:32 +08:00
tianshujie98 eeea421cf9 * Finish task #7487,7488. 2020-07-20 13:13:41 +08:00
sgm0422 f88acd63b8 * Finish task #7415. 2020-07-13 16:11:26 +08:00
wangyidong af6a2f26bc * code for batchcreate and batchedit with flow. 2020-05-29 13:45:41 +08:00
wangyidong 3932514956 * code for task #7089. 2020-05-14 11:06:54 +08:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong 0c3970f4d1 * adjust for create task page when linked stories too much. 2020-04-08 13:17:58 +08:00
wangyidong cfa5261960 * finish task #6902 and merge xuanxuan. 2020-03-17 16:38:44 +08:00
wangyidong b93dd94b05 * code for task #6548. 2019-11-21 16:19:59 +08:00
Catouse 827db2d03f * task #6525, bug #2791. 2019-11-21 14:19:33 +08:00
wangyidong 23c78dece4 * finish task #6548. 2019-11-20 14:25:59 +08:00
wangyidong c628ea60ef * adjust for style. 2019-11-07 11:31:33 +08:00
Yagami 06738da7b7 * Fix activate parent task logic. 2019-10-14 09:27:21 +08:00
liugang dc022ad849 * Optimize function to printExtendFields. 2019-08-13 14:58:15 +08:00
liugang ca3032e325 * Set hidden status in pages. 2019-08-05 17:25:30 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
liugang 9df3aaf581 * Use function processStatus to get status of a task. 2019-07-30 13:08:17 +08:00