Commit Graph
37927 Commits
Author SHA1 Message Date
zenggang 560a95f623 * Fix bug #28983 2022-10-27 05:27:32 +00:00
孙广明 992750c11c Merge branch 'mayue_feedback#1270' into 'master'
Finish feedback #1270.

See merge request easycorp/zentaopms!5906
2022-10-27 02:38:14 +00:00
孙广明 3fc7602e08 Merge branch 'mayue_feedback#1261' into 'master'
Finish feedback#1261

See merge request easycorp/zentaopms!5907
2022-10-27 02:34:31 +00:00
孙广明 34c04a63e1 Merge branch 'mayue_feedback#1025' into 'master'
* Finish feedback #1025.

See merge request easycorp/zentaopms!5905
2022-10-27 02:32:18 +00:00
wangyidong bac3655fee * fix bug #28976. 2022-10-27 09:56:24 +08:00
孙广明 4b815d2f0c Merge branch 'liyuchun_fix_bug' into 'master'
* Update user view when edit whitelist.

See merge request easycorp/zentaopms!5895
2022-10-27 01:04:02 +00:00
李玉春 e419d7004b Merge branch 'sprint/253_tianshujie_dashboard' into 'master'
Sprint/253 tianshujie dashboard

See merge request easycorp/zentaopms!5899
2022-10-27 00:21:49 +00:00
tianshujie 49da824085 * Remove useless code. 2022-10-27 08:17:42 +08:00
mayue 44f182b305 * Optimize code. 2022-10-26 17:11:59 +08:00
mayue 426a116e96 * Finish feedback #1261. 2022-10-26 16:38:45 +08:00
zenggang f3f92631e3 * Fix bug#28983 2022-10-26 08:38:23 +00:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
tianshujie f54ab6edc4 * Finish task #73749. 2022-10-26 15:41:44 +08:00
tianshujie 99e6e88e76 * Finish task #73748. 2022-10-26 15:40:59 +08:00
tianshujie 5c27a96042 Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 15:38:27 +08:00
tianshujie 324245db52 * Finish task #73748. 2022-10-26 15:38:03 +08:00
tianshujie dbb7a17464 * Finish task #73746. 2022-10-26 15:30:11 +08:00
caoyanyi a3a5f5add2 Merge branch 'master' into sprint/253_tianshujie_dashboard 2022-10-26 15:14:04 +08:00
caoyanyi e28284d001 * Code for task #73764. 2022-10-26 15:04:34 +08:00
tianshujie f1fb4cf2f9 Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 14:58:44 +08:00
tianshujie 58e4192fe2 * Finish task #73746. 2022-10-26 14:58:27 +08:00
李玉春 624ea22524 Merge branch 'sprint/cyy_73414' into 'master'
Sprint/cyy 73414

See merge request easycorp/zentaopms!5892
2022-10-26 06:36:42 +00:00
caoyanyi 7b545e9a25 * Code for task #73763. 2022-10-26 14:35:36 +08:00
liyuchun 8285a1d2d6 * Update user view when edit whitelist. 2022-10-26 14:32:51 +08:00
tianshujie 636dff4a3a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 14:31:44 +08:00
tianshujie 03276390b2 * Finish task #73749. 2022-10-26 14:09:18 +08:00
王怡栋 73e227962d Merge branch 'feature/master/fb_785_refine' into 'master'
Resolve feedback #785

See merge request easycorp/zentaopms!5893
2022-10-26 06:08:50 +00:00
tianshujie b7a0d76922 * Finish task #73749. 2022-10-26 14:06:52 +08:00
tianshujie d7af949b90 * Finish task #73732. 2022-10-26 14:05:08 +08:00
tianshujie 935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
tianshujie 2f97d5a8ad * Finish task #73750. 2022-10-26 13:50:52 +08:00
caoyanyi b2a64e9f25 * Modify status style. 2022-10-26 13:41:39 +08:00
陈涛 b606f8ba3a Resolve feedback #785 2022-10-26 05:35:02 +00:00
tianshujie 9d5c06cc6d * Finish task #73748. 2022-10-26 13:30:28 +08:00
tianshujie cea28c452c * Finish task #73749. 2022-10-26 13:25:40 +08:00
tianshujie 308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
tianshujie 1dfce702bd * Finish task #73752. 2022-10-26 11:31:28 +08:00
陈涛 b878528be2 Resolve feedback #785 2022-10-26 03:08:44 +00:00
tianshujie 826eb771b9 * Finish task #73732. 2022-10-26 11:04:29 +08:00
tianshujie 012e867e40 * Finish task #73731. 2022-10-26 10:52:42 +08:00
tianshujie 669db02ecc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 10:33:23 +08:00
caoyanyi ffc5b2afd9 * Remove language. 2022-10-26 10:15:23 +08:00
caoyanyi ab2f607766 Merge branch 'master' into sprint/253 2022-10-26 10:14:07 +08:00
guofeilong 2f76df117e * fix bug #26774 2022-10-26 10:11:44 +08:00
tianshujie 0aeb97af62 * Fix bug #28892. 2022-10-26 10:11:44 +08:00
tianshujie 196cb8b16d * Fix bug #28878. 2022-10-26 10:11:44 +08:00
wangzemei e068344975 fix bug 28790 2022-10-26 10:11:44 +08:00
caoyanyi caa115a393 * Fix bug #28788. 2022-10-26 10:11:44 +08:00
wangzemei 8aff0b9596 * adjust the format 2022-10-26 10:11:44 +08:00
tianshujie 33d30c2df4 * Optimize the style of maintaining multi-tasking teams. 2022-10-26 10:11:44 +08:00