Commit Graph
41868 Commits
Author SHA1 Message Date
caoyanyi 75bf140f6d * Modify repo page data. 2022-07-12 15:37:16 +08:00
caoyanyi ed24e40025 * Modify page error. 2022-07-12 15:36:57 +08:00
李玉春 bf59409a1f Merge branch 'cyy_60565' into 'zenops_38'
Finish task #60565,60566.

See merge request easycorp/zentaopms!4465
2022-07-12 05:20:42 +00:00
caoyanyi ae7c259ab1 * Adjust codes. 2022-07-12 13:18:54 +08:00
caoyanyi 223ab3a2f8 * Adjust code. 2022-07-12 13:13:04 +08:00
caoyanyi 8e2c831722 * Modify param name. 2022-07-12 09:51:36 +08:00
caoyanyi e5ffd04c34 * Finish task #60565,60566. 2022-07-12 09:45:31 +08:00
孙广明 71031aa465 Merge branch 'liyuchun_60452' into 'zenops_38'
* Finish task #60452.

See merge request easycorp/zentaopms!4457
2022-07-12 00:30:54 +00:00
liyuchun 625631c625 * Adjust scm. 2022-07-11 08:59:50 +00:00
liyuchun 23de383c83 * Finish task #60452. 2022-07-11 08:57:24 +00:00
李玉春 a5b2c8de20 Merge branch 'sprint/wangzemei/25041' into 'master'
* Fix bug #25041

See merge request easycorp/zentaopms!4448
2022-07-11 06:11:53 +00:00
wangzemei 7bb8a64638 * Fix bug #25041 2022-07-11 06:04:07 +00:00
王怡栋 00b073ba18 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4447
2022-07-11 02:36:02 +00:00
wangyidong 35c8543a74 * adjust for check account in set vision. 2022-07-11 10:08:40 +08:00
王怡栋 43cc464b54 Merge branch 'sprint/213_mayue_bug25031' into 'master'
* Fix bug #25031.

See merge request easycorp/zentaopms!4446
2022-07-11 02:08:13 +00:00
mayue 88a580898d * Optimize code. 2022-07-11 10:06:43 +08:00
mayue 5bedd02491 * Fix bug #25031. 2022-07-11 09:54:58 +08:00
tianshujie 07a1f0bf6a * Fix bug #24981. 2022-07-11 09:16:44 +08:00
tianshujie 8e5ac76ae7 * Fix bug #24923. 2022-07-11 08:49:00 +08:00
wangyidong 43c9570c98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-08 17:36:59 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
刘刚 f37e8309a3 Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.

See merge request easycorp/zentaopms!4444
2022-07-08 09:34:43 +00:00
liuruogu 3f7f25dd8a * Finish task #59641. 2022-07-08 09:20:14 +00:00
王怡栋 96ad1bfff8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25016

See merge request easycorp/zentaopms!4440
2022-07-08 07:22:37 +00:00
王怡栋 fb8bd88891 Merge branch 'sprint/tianshujie_24913' into 'master'
* Fix bug #24913.

See merge request easycorp/zentaopms!4441
2022-07-08 07:21:44 +00:00
tianshujie fe226c094b * Fix bug #24913. 2022-07-08 15:17:02 +08:00
孙广明 0264b6c3f9 Merge branch 'sprint/scx_translate' into 'master'
Sprint/scx translate

See merge request easycorp/zentaopms!4429
2022-07-08 07:11:20 +00:00
孙广明 3fc4834248 Merge branch 'liyuchun_24840' into 'master'
* Fix bug when download code zip.

See merge request easycorp/zentaopms!4439
2022-07-08 07:11:01 +00:00
孙广明 77ec1c0bac Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59543.

See merge request easycorp/zentaopms!4433
2022-07-08 07:10:47 +00:00
lanzongjun 5c95d9fd18 * fix bug #25016 2022-07-08 14:52:46 +08:00
wangyidong 9c61acba52 * fix bug for misc-captcha. 2022-07-08 14:46:25 +08:00
liyuchun 69871d4c69 * Fix bug when download code zip. 2022-07-08 06:35:36 +00:00
王怡栋 8fb0a728cd Merge branch 'sprint/master_zhouxudong_24844' into 'master'
* Fix bug #24844.

See merge request easycorp/zentaopms!4438
2022-07-08 06:29:01 +00:00
李玉春 be3823aa09 Merge branch 'cyy_25032' into 'master'
* Fix bug #25032.

See merge request easycorp/zentaopms!4436
2022-07-08 06:23:43 +00:00
李玉春 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
zhouxudong f7b8ef064f * Fix bug #24844. 2022-07-08 05:51:40 +00:00
caoyanyi 8267cfaa94 * Fix bug #25032. 2022-07-08 13:50:23 +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
xieqiyu 375b0c2a6f * Code for task#59543. 2022-07-08 13:25:39 +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
宋辰轩 fce90ae22b *Edit testreport lang. 2022-07-08 11:30:37 +08:00