Commit Graph

1267 Commits

Author SHA1 Message Date
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙广明
6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu
74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
王怡栋
38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
xieqiyu
09f4270792 * Modify the module of test case when change product type. 2022-02-25 13:10:54 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhengrunyu
c9f2aa8d5c *Delete null. 2022-02-23 09:36:51 +08:00
songchenxuan
af5e92b4eb *Edit lang. 2022-02-21 17:04:03 +08:00
zhengrunyu
0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
hufangzhou
64f8980289 * Fix bug #19506. 2022-02-14 13:57:52 +08:00
李玉春
e6db39683a Merge branch 'devops21_zhangzilong_19319' into 'master'
# Fix bug #19319.

See merge request easycorp/zentaopms!1782
2022-02-14 03:28:55 +00:00
zhangzilong
3a545530a6 * Code for bug #19319. 2022-02-14 11:28:01 +08:00
zhangzilong
1195ff854b * Fix bug #19319. 2022-02-14 11:20:41 +08:00
zhangzilong
127c3ff36a * Code for bug #19319. 2022-02-14 11:16:23 +08:00
zhangzilong
bb828d54cf * Code for bug #19319. 2022-02-14 11:13:24 +08:00
zhangzilong
106447b401 * Fix bug #19319. 2022-02-14 10:56:50 +08:00
zhangzilong
dcdfb0cdee * Fix bug #19319. 2022-02-14 10:32:12 +08:00
zhouxudong
0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhouxudong
8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
zhouxudong
1ea961b209 *Fix bug #19266. 2022-02-07 17:19:20 +08:00
songchenxuan
1993f8ec27 *Report lang. 2022-01-21 09:08:45 +08:00
songchenxuan
2cc7870623 *Finish task #47951,47952,47953. 2022-01-19 10:22:02 +08:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
孙广明
3ab13aa61e Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.

See merge request easycorp/zentaopms!1322
2022-01-11 00:36:32 +00:00
songchenxuan
bb13431274 *Fix bug 18074. 2022-01-11 08:34:55 +08:00
liumengyi
cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
songchenxuan
3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
liumengyi
6613dc493f * Finish task #47092. 2022-01-06 15:29:45 +08:00
liumengyi
42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
xieqiyu
5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
王怡栋
7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
2021-12-06 07:14:51 +00:00
孙广明
e24ded1429 Merge branch 'sprint/174_hufangzhou_17116' into 'master'
* Fix bug #17116, bug #17117.

See merge request easycorp/zentaopms!789
2021-12-06 05:07:38 +00:00
hufangzhou
05d9182e31 * Fix bug #17116, bug #17117. 2021-12-06 12:09:15 +08:00
李玉春
4a2d21595e Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17079.

See merge request easycorp/zentaopms!778
2021-12-06 03:22:48 +00:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
孙广明
ad1cc7c04f Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.

See merge request easycorp/zentaopms!774
2021-12-06 02:33:35 +00:00
xieqiyu
4de8fc462f * Fix bug#17079. 2021-12-06 09:33:41 +08:00
hufangzhou
e1b5dd4642 * Add the unitcases method for remove the branch select. 2021-12-06 09:12:46 +08:00
liyuchun
5c23642d36 * Fix bug #16639. 2021-12-06 09:06:50 +08:00
hufangzhou
6eeaa44aa0 * Fix bug #17077. 2021-12-06 08:58:58 +08:00
mayue
8ba4ebf390 * Conflict resolution #17036. 2021-12-02 15:40:02 +08:00
mayue
f6676e2757 * Conflict resolution #17036. 2021-12-02 15:36:31 +08:00