Commit Graph
47000 Commits
Author SHA1 Message Date
wangyuting2 b48e275bcd * Optimize code. 2022-10-28 05:13:54 +00:00
wangyuting2 f61479fe2d * Finish task #73819. 2022-10-27 07:39:29 +00:00
王 于听 46aafd792c Merge branch 'zentaopms_239_task#73818' into 'zentaopms_239'
* Finish task #73818.

See merge request easycorp/zentaopms!5918
2022-10-27 06:47:19 +00:00
wangyuting2 fc95cc66a0 * Optimize code. 2022-10-27 06:46:57 +00:00
王怡栋 38155947ff Merge branch 'zentaopms_239_task_#72756' into 'zentaopms_239'
* Finish task #72756.

See merge request easycorp/zentaopms!5910
2022-10-27 06:45:31 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
王 于听 d6ad51dbb3 Merge branch 'zentaopms_239_task#73814' into 'zentaopms_239'
* Finish task #73814.

See merge request easycorp/zentaopms!5917
2022-10-27 06:42:27 +00:00
daitingting c338b9a237 * Adjust codes. 2022-10-27 06:30:12 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00
王怡栋 909e148115 Merge branch 'zentaopms_239_bug#28962' into 'zentaopms_239'
* Fix bug #28962.

See merge request easycorp/zentaopms!5904
2022-10-27 05:46:46 +00:00
王怡栋 c1db41db21 Merge branch 'zentaopms_239_task#28924' into 'zentaopms_239'
* Fix bug #28924.

See merge request easycorp/zentaopms!5902
2022-10-27 05:46:29 +00:00
daitingting 7727f1ee7b * Remove useless codes. 2022-10-27 05:21:14 +00:00
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 132eb72a4d * adjust for my bug. 2022-10-27 11:46:28 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08: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
wangyuting2 4ef3946f44 * Fix bug #28962. 2022-10-27 01:17:06 +00: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
王怡栋 8d81f449c1 Merge branch 'zentaopms_239_syncsprint' into 'zentaopms_239'
* adjust for task #73474.

See merge request easycorp/zentaopms!5903
2022-10-27 01:04:00 +00:00
wangyuting2 a4e210b425 * Finish task #28924. 2022-10-27 00:58:32 +00:00
wangyidong 14a17688cd * adjust for task #73474. 2022-10-27 08:58:11 +08:00
wangyidong ce74f027b4 * adjust for show all projects. 2022-10-27 08:27:52 +08: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
王怡栋 62674da78b Merge branch 'bug_28983' into 'master'
* Fix bug#28983

See merge request easycorp/zentaopms!5898
2022-10-26 09:27:19 +00:00
王怡栋 b9dc36968b Merge branch 'zentaopms_239_syncsprint' into 'zentaopms_239'
* code for task #73476,73475,73474,73473.

See merge request easycorp/zentaopms!5900
2022-10-26 09:26:39 +00:00
mayue 44f182b305 * Optimize code. 2022-10-26 17:11:59 +08:00
caoyanyi babcfd9e12 * Modify testcase style. 2022-10-26 16:58:50 +08:00
王怡栋 cb3671ed66 Merge branch 'zentaopms_239_task#73470' into 'zentaopms_239'
* Finish task #73470.

See merge request easycorp/zentaopms!5896
2022-10-26 08:46:55 +00:00
wangyidong 6208970fde * code for task #73476,73475,73474,73473. 2022-10-26 16:41:16 +08:00
caoyanyi 3705554529 * Modify bug severity style. 2022-10-26 16:41:03 +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
caoyanyi 340b9d5c69 * Modify workflow page style. 2022-10-26 16:15:02 +08:00
caoyanyi 115d700079 * Modify workflow page style. 2022-10-26 16:13:07 +08:00
tianshujie a9fc00baa6 Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 15:56:15 +08:00
tianshujie 8f75ae7455 * Finish task #73736,73731. 2022-10-26 15:54:19 +08:00
caoyanyi d7a0549316 * Modify task view style. 2022-10-26 15:53:06 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
tianshujie ac39fa2d6b Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 15:42:21 +08:00
caoyanyi 0074054f10 * Modify severity style. 2022-10-26 15:41:52 +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