Commit Graph
41828 Commits
Author SHA1 Message Date
李玉春 30401195fa Merge branch 'sprint/wangzemei/59544_1' into 'master'
Sprint/wangzemei/59544 1

See merge request easycorp/zentaopms!4437
2022-07-08 05:57:16 +00:00
孙广明 b2634d5e85 Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #23123.

See merge request easycorp/zentaopms!4434
2022-07-08 05:57:06 +00:00
liumengyi 29993afa9e * Optimize code for bug #23123. 2022-07-08 13:55:41 +08:00
liumengyi f9b24fb48c * Fix bug of task #23123. 2022-07-08 13:52:33 +08:00
wangzemei cc1f3ca95b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/59544_1 2022-07-08 05:50:14 +00:00
朱金勇 1a9fd62e71 Merge branch 'sprint/tianshujie_25034' into 'master'
* Fix bug #25034.

See merge request easycorp/zentaopms!4435
2022-07-08 05:49:32 +00:00
liumengyi 9921474711 * Fix bug #23123. 2022-07-08 13:43:43 +08:00
tianshujie b09a5907ec * Fix bug #25034. 2022-07-08 13:43:23 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
王怡栋 82401d1909 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4432
2022-07-08 05:06:21 +00:00
tianshujie 3213065954 * Fix bug #24802. 2022-07-08 13:05:07 +08:00
tianshujie 9df3094887 * Troubleshooting Play Course 302 Network Issues. 2022-07-08 11:32:17 +08:00
王怡栋 b202420822 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
* Finish task #59681.

See merge request easycorp/zentaopms!4431
2022-07-08 03:30:23 +00:00
zhouxudong e8da735c95 * Finish task #59681. 2022-07-08 03:28:02 +00:00
孙广明 4049441bbe * Fix linkcase bug. 2022-07-08 11:24:09 +08:00
孙广明 cb3651f49d Merge branch 'sprint/213_mayue_task59710' into 'master'
* Finish task #59710.

See merge request easycorp/zentaopms!4430
2022-07-08 03:20:42 +00:00
孙广明 1f1b0b1bda * Fix linkcase error. 2022-07-08 11:19:51 +08:00
孙广明 bcd51ec9df * For code error. 2022-07-08 11:13:54 +08:00
mayue 7ff031bc5f * Finish task #59710. 2022-07-08 11:13:30 +08:00
tianshujie 6792048cfc * Fix bug #24802. 2022-07-08 11:08:40 +08:00
tianshujie 6be409262a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-08 11:01:03 +08:00
tianshujie abce7ba766 * Fix bug #24314. 2022-07-08 10:55:17 +08:00
孙广明 39d2a529b0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4428
2022-07-08 02:46:11 +00:00
孙广明 df7787bbd1 Merge branch 'fixbug_createTask' into 'master'
Fixbug create task

See merge request easycorp/zentaopms!4427
2022-07-08 02:43:15 +00:00
tianshujie c4e930ce49 * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 10:41:23 +08:00
sunjun d2b201003b fixbug 2022-07-08 02:37:29 +00:00
孙广明 a6df7edcc1 Merge branch 'liyuchun_24840' into 'master'
* Fix bug #24840,24821.

See merge request easycorp/zentaopms!4425
2022-07-08 02:36:46 +00:00
tianshujie fe4b40e3cd * Fix bug #24127. 2022-07-08 10:34:05 +08:00
sunjun ed422485ed fixbug_report 2022-07-08 02:31:37 +00:00
tianshujie 2c6aeb6c19 * Fix bug #25014. 2022-07-08 10:15:18 +08:00
王怡栋 f61cacca8f Merge branch 'sprint212_leiyong_fix_bug' into 'master'
* Fix bug#24812.

See merge request easycorp/zentaopms!4408
2022-07-08 02:09:43 +00:00
王怡栋 272ba58696 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
Sprint/master zhouxudong 59681

See merge request easycorp/zentaopms!4426
2022-07-08 02:09:05 +00:00
zhouxudong 7988466f2f * Finish task #59681. 2022-07-08 02:07:45 +00:00
zhouxudong e146c91ecb * Finish task #59681. 2022-07-08 02:04:04 +00:00
孙广明 03f48af37f Merge branch 'sprint213_zg_59711' into 'master'
Hide cdf stat

See merge request easycorp/zentaopms!4424
2022-07-08 02:03:50 +00:00
sunjun f7400480d4 fixbug_createTask 2022-07-08 02:02:22 +00:00
leiyong b7074c0ec0 * Adjust CSS. 2022-07-08 01:58:21 +00:00
zhouxudong 85cecc60e5 * Finish task #59681. 2022-07-08 01:55:07 +00:00
tianshujie 102326db4f * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 09:48:08 +08:00
wangyidong 38cc476bb9 * fix bug #22749. 2022-07-08 09:47:42 +08:00
zhouxudong f8c7be2001 * Finish task #59681. 2022-07-08 01:47:03 +00:00
leiyong ea75f32195 * Adjsut CSS. 2022-07-08 01:46:15 +00:00
liyuchun 0951f5b56d * Fix bug #24840,24821. 2022-07-08 01:45:48 +00:00
zenggang b8c23acb69 * Adjust code 2022-07-08 01:42:17 +00:00
zenggang a01d530a0a * Hide cfd stat 2022-07-08 01:38:33 +00:00
孙广明 118e1f7854 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4420
2022-07-08 01:20:53 +00:00
孙广明 8ce405dec0 Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.

See merge request easycorp/zentaopms!4423
2022-07-08 01:20:09 +00:00
mayue 1df55e32a7 * Fix bug #24848#24817. 2022-07-08 09:18:53 +08:00
孙广明 6b33905ac8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4422
2022-07-08 01:10:03 +00:00
mayue f6d94ad4cb * Fix bug #24848#24817. 2022-07-08 09:06:39 +08:00