Commit Graph
240 Commits
Author SHA1 Message Date
xieqiyu 28ef479910 * Modify code of review. 2022-11-15 17:16:30 +08:00
xieqiyu 8bc640bd29 * Fix bug#29752. 2022-11-15 13:50:31 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong 36f9aa8ad5 * code for task #71660.#71661,#71662,#71663,#71664,#71665. 2022-10-11 15:54:40 +08:00
tianshujie df424fcefe * Fix bug #28431. 2022-10-11 13:19:03 +08:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
tianshujie 6c39ac6ba5 * Finish task #71899. 2022-10-10 09:49:54 +08:00
wangyidong a51f42e7b8 * code for task #71609. 2022-10-10 09:08:28 +08:00
wangzemei ebb21c3ad4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71898 2022-10-10 09:02:21 +08:00
wangzemei 2a2e17b0e2 * remove not empty check 2022-10-10 09:02:10 +08:00
wangzemei 54f94d95c0 * finish task #71898 2022-10-09 10:42:30 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
tianshujie c204037450 * Finish task #70017. 2022-09-28 13:51:12 +08:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
dongli 91908bc56b * Fix bug #63669. 2022-08-10 23:59:31 +00:00
liumengyi 175a703f11 * Fix bug #26020. 2022-08-05 10:49:10 +08:00
leiyong a5b4a79ea8 * Adjust code. 2022-06-28 05:26:37 +00:00
zhouxin c7aa2f7fff * Adjust code. 2022-06-10 01:43:10 +00:00
孙广明 f02350122a Merge branch 'liyuchun_56551' into 'master'
Liyuchun 56551

See merge request easycorp/zentaopms!3822
2022-06-09 09:21:32 +00:00
zhouxin 5500e2fb58 * Fix bug for task #56458. 2022-06-09 08:54:56 +00:00
liyuchun bd2503c558 Merge branch 'liyuchun_56551' of https://gitlab.zcorp.cc/easycorp/zentaopms into liyuchun_56551 2022-06-09 06:00:44 +00:00
liyuchun 975088c89d * Adjust task width. 2022-06-09 05:59:43 +00:00
zhouxin c056b7e567 * Finish task #56461,56462,56458,56465. 2022-06-09 05:18:27 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
sunjun 7174926385 fixbug 2022-05-20 05:25:11 +00:00
sunjun 8fe60b85d0 fixbug 2022-05-20 05:14:35 +00:00
sunjun e1acea800f fixbug_sunjun_22695 2022-05-20 05:11:52 +00:00
sunjun a34835e5a0 fixbug_sunjun_22696 2022-05-20 02:14:16 +00:00
sunjun 7ce0103bba sprint_sunjun_54321 2022-05-17 08:59:11 +00:00
zhouxudong 5a8089c3fb * Fix bug from max #15833. 2022-04-22 09:30:05 +08:00
孙华伟 9c34cc22a2 Optimize the code. 2022-03-30 01:42:07 +00:00
孙华伟 c4d579152b Optimize the code 2022-03-30 01:35:32 +00:00
孙华伟 e26cbcc00c *Fix bug#16677. 2022-03-29 16:40:05 +08:00
tianshujie 5b5213c761 * Fix bug #20301. 2022-03-04 13:21:09 +08:00
tianshujie ae154aea0c * Modify the code logic. 2022-03-04 11:18:03 +08:00
tianshujie fc2bd0bbdc * Fix bug #20307,18089. 2022-03-04 11:00:58 +08:00
tianshujie 6dc0d7a70d * Solve the problem that the project field of the pending task list is 0. 2022-03-04 09:04:02 +08:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
tianshujie 947c9586f5 * Finish task #47350. 2022-01-14 15:06:22 +08:00
hufangzhou 863965e61a * Finish task #46097. 2021-12-21 15:53:27 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun 9617d52d93 * task #44164, update task list after close modal. 2021-11-11 13:10:12 +08:00