Commit Graph

775 Commits

Author SHA1 Message Date
holan20180123
c53e9ac526 * Finish task #9002. 2021-01-15 14:28:57 +08:00
holan20180123
a8bf48d3c8 * Finish task #9002. 2021-01-15 11:13:01 +08:00
leiyong
970f3e11a5 * Adjust the batchedit method icons. 2021-01-01 14:37:16 +08:00
tianshujie98
c969d44561 * Fix the bug sorting of tasks on my module. 2020-12-29 14:10:36 +08:00
Yagami
66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
leiyong
ea3300acf4 * Replace ->planCommon. 2020-12-17 17:20:12 +08:00
holan20180123
7df9406760 * Finish task #8666. 2020-12-17 14:03:06 +08:00
holan20180123
ff67859fd0 * Fix bug #3708. 2020-12-14 16:24:35 +08:00
holan20180123
f4dc0e656c * Fix bug #3708. 2020-12-14 16:10:47 +08:00
wangyidong
c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
tianshujie98
dabb2d003d * Adjust code style. 2020-12-11 15:45:03 +08:00
wangyidong
fa246c1173 * finish task #3688. 2020-12-08 14:52:26 +08:00
holan20180123
9cdcd2a428 * Fix bug #3636. 2020-12-07 13:10:59 +08:00
holan20180123
bab45be34c * Fix bug #3636. 2020-12-07 13:06:35 +08:00
tianshujie98
1d431a1155 * Fix bug #3687. 2020-12-02 14:25:57 +08:00
tianshujie98
d27ce0f463 * Fix bug #3687. 2020-12-02 10:32:44 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123
cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
qiyu-xie
1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
z
6bb99132e2 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-04 10:38:43 +08:00
z
eb53d44b81 * code for task #8279. 2020-11-04 10:33:20 +08:00
hufangzhou
a13f8cd4c0 * Adjust the logic of the assigned to. 2020-11-03 17:26:51 +08:00
hufangzhou
4ea37d68a2 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-03 16:49:19 +08:00
hufangzhou
a6e6f7a8a2 * Finish task#8201: Add the assignedTo field for the start task page. 2020-11-03 16:49:03 +08:00
qiyu-xie
066046658d * Finish task#8240. 2020-11-03 16:10:02 +08:00
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