Commit Graph
2523 Commits
Author SHA1 Message Date
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 521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami 116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
z 505ed7c1bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:54:46 +08:00
z 4f47220347 * finish task #7698. 2020-08-27 13:54:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b909b26194 * Fix details. 2020-08-26 16:19:28 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie dd49d9e613 * Add task module lang. 2020-08-26 10:34:58 +08:00
qiyu-xie 1a9df49057 * Add task module lang. 2020-08-26 10:14:41 +08:00
Yagami 4e0a3d0da5 * Fix block details. 2020-08-25 14:59:24 +08:00
leiyong c82fc3ff60 * Add scrum block module. 2020-08-20 15:49:26 +08:00
z 6cdef8d7d3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-18 14:11:53 +08:00
z be28a89aea * fix bug for flow. 2020-08-18 14:09:30 +08:00
qiyu-xie 4170ad49b5 Fix bug #2582 2020-08-17 08:59:45 +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 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
tianshujie98 ada770c792 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-13 09:36:32 +08:00
tianshujie98 f3c3ad3647 * Fix bug #2577. 2020-08-13 09:35:22 +08:00
qiyu-xie db81c170d0 Fix bug #2585 2020-08-12 10:17:41 +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
holan20180123 7edd4ee1d7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-10 17:34:06 +08:00
holan20180123 afdf88d276 * Fix bug #3340. 2020-08-10 17:33:42 +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
holan20180123 5e9d47b062 * Finish task #7613. 2020-08-10 11:31:50 +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 da4222a8f4 * Fix bug #2564. 2020-08-06 15:56:25 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
tianshujie98 bb3658ecf8 * Fix bug #2504. 2020-08-05 17:58:17 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98 ae1a3396ba Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 09:41:47 +08:00
tianshujie98 7dc09c5374 * Finish task #7584. 2020-08-05 09:29:53 +08:00
z bb3ad790d0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-04 14:02:28 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
holan20180123 c351b21b76 * Finish task #7571. 2020-07-31 15:53:40 +08:00