Commit Graph

794 Commits

Author SHA1 Message Date
zenggang
ec4bdc3477 * finish task#39797 2021-07-02 00:54:16 +00:00
Yagami
b6b31de401 * Finish task #38715. 2021-06-21 14:51:35 +08:00
tianshujie98
61b2439593 * Fix bug 13268. 2021-06-21 14:30:54 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
tianshujie98
931b4e51bd * Fix bug #12520. 2021-05-06 15:50:50 +08:00
wangyidong
0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
wangyidong
1bad944701 * merge from 12.x. 2021-04-01 13:25:05 +08:00
holan20180123
9dd1b5af27 * Fix bug #11422. 2021-03-29 09:37:05 +08:00
holan20180123
81e74ec9e5 * Fix task #36754. 2021-03-19 15:41:05 +08:00
holan20180123
b5434ed770 * Refresh block when finished todo. 2021-03-19 10:49:08 +08:00
holan20180123
a41e43311a * Distinguish project execution from task module. 2021-03-05 09:35:40 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
qiyu-xie
e9d2711275 * Finish task#9094. 2021-01-27 11:23:48 +08:00
qiyu-xie
e86054b4f2 * Finish task#9103. 2021-01-26 15:44:28 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
holan20180123
aff132b1b1 * Adjust the style. 2021-01-20 16:21:57 +08:00
holan20180123
04b481c6ce * Finish task #9002. 2021-01-19 16:15:00 +08:00
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
wangyidong
04b16e05d0 * Use isZeroDate function to check. 2020-12-17 17:26:23 +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
94202fdd89 * Fix bug #3708. 2020-12-14 16:21:45 +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