Commit Graph
48226 Commits
Author SHA1 Message Date
xieqiyu afb647bedf * Fix bug#30187. 2022-11-24 09:31:24 +08:00
王怡栋 307629f078 * change nodeletereleased param to withreleased. 2022-11-23 17:23:02 +08:00
王怡栋 cb00dd2f6e Merge branch 'sprint/konglingmao_feedback1514' into 'master'
+ Resolved feedback #1514, notice error when project required.

See merge request easycorp/zentaopms!6341
2022-11-23 09:20:17 +00:00
孔令茂 e076bcc39f + Resolved feedback #1514, notice error when project required. 2022-11-23 09:12:29 +00:00
Yagami 68bc5b8012 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-23 16:56:01 +08:00
Yagami a3d5965b4f * Modify img. 2022-11-23 16:55:34 +08:00
孙广明 86aa6ec66c Merge branch 'master_xieqiyu_77253' into 'master'
* Fix bug#30032.

See merge request easycorp/zentaopms!6338
2022-11-23 08:45:38 +00:00
王怡栋 c2c238ecc1 Merge branch 'master_bug_23269' into 'master'
* Fix bug #30162.

See merge request easycorp/zentaopms!6339
2022-11-23 08:31:05 +00:00
liuhong 9b70804cfd * Fix bug #30162. 2022-11-23 08:23:51 +00:00
孙广明 4d872db6f2 Merge branch 'sprint/zentaopms262_mayue_bug#30021' into 'master'
* Fix bug #30021.

See merge request easycorp/zentaopms!6337
2022-11-23 08:18:29 +00:00
xieqiyu e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
mayue c0879ef983 * Fix bug #30021. 2022-11-23 16:16:06 +08:00
王怡栋 0330c90d05 Merge branch 'zentaopms_263_bug_30165' into 'master'
* Fix bug #30165,#30170.

See merge request easycorp/zentaopms!6336
2022-11-23 08:13:59 +00:00
王怡栋 03d888faf2 Merge branch 'bug_26556' into 'master'
* Fix bug#26556

See merge request easycorp/zentaopms!6334
2022-11-23 08:13:40 +00:00
王怡栋 0f5110c024 Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Adjust the changelog.

See merge request easycorp/zentaopms!6333
2022-11-23 08:13:20 +00:00
王怡栋 df41806707 Merge branch 'zentaopms_263_wangyuting3' into 'master'
* Optimize set module page css.

See merge request easycorp/zentaopms!6331
2022-11-23 08:13:06 +00:00
王怡栋 e8ebacaf09 Merge branch 'zentaopms_263_bug_#30085' into 'master'
* Fix bug #30085.

See merge request easycorp/zentaopms!6329
2022-11-23 08:12:49 +00:00
daitingting 48d2209722 * Fix bug #30165,#30170. 2022-11-23 08:10:39 +00:00
孙广明 3799e7078f Merge branch 'master_xieqiyu_30163' into 'master'
* Fix bug#30163.

See merge request easycorp/zentaopms!6330
2022-11-23 08:02:42 +00:00
孙广明 135f8d36a2 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29716,#30056.

See merge request easycorp/zentaopms!6332
2022-11-23 08:02:22 +00:00
孙广明 e2571ee150 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30157

See merge request easycorp/zentaopms!6335
2022-11-23 08:01:46 +00:00
lanzongjun 40ee11ba30 * Fix Bug #30157 2022-11-23 15:59:21 +08:00
zenggang d76f5da235 * Fix bug#26556 2022-11-23 07:49:01 +00:00
hufangzhou 4b9bc5727b * Adjust the changelog. 2022-11-23 07:45:11 +00:00
xieqiyu 3afc823177 * Fix bug#29716,#30056. 2022-11-23 15:34:30 +08:00
wangyuting aa08e084e1 * Optimize set module page css. 2022-11-23 07:24:40 +00:00
xieqiyu 58cb6d681d * Fix bug#30163. 2022-11-23 14:57:01 +08:00
王怡栋 105a72f34c * fix bug #30158. 2022-11-23 14:55:44 +08:00
daitingting 2c709e02ab * Fix bug #30085. 2022-11-23 06:54:34 +00:00
王怡栋 1bf75c2d0a Merge branch 'zentaopms_263_bug_#30151' into 'master'
* Fix bug #30151.

See merge request easycorp/zentaopms!6328
2022-11-23 06:12:20 +00:00
王怡栋 af88ae8739 * fix for show bug openedBuild and reslovedBuild. 2022-11-23 14:05:51 +08:00
daitingting 96623039db * Fix bug #30151. 2022-11-23 06:05:32 +00:00
王怡栋 65e48a1c49 Merge branch 'zentaopms_263_bug#30141' into 'master'
* Fix bug #30141.

See merge request easycorp/zentaopms!6322
2022-11-23 05:45:20 +00:00
王怡栋 2cd292eedf Merge branch 'zentaopms_263_bug#29641' into 'master'
* Fix bug #29641.

See merge request easycorp/zentaopms!6321
2022-11-23 05:45:06 +00:00
王怡栋 476ceeaa6a Merge branch 'bug_27991' into 'master'
Bug 27991

See merge request easycorp/zentaopms!6319
2022-11-23 05:44:52 +00:00
Yagami 307e9c5f62 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-23 13:44:25 +08:00
王怡栋 838f499ca6 Merge branch 'zentaopms_263_bug_#30104' into 'master'
* Fix bug #30104.

See merge request easycorp/zentaopms!6318
2022-11-23 05:44:05 +00:00
王怡栋 3dd409514c Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.

See merge request easycorp/zentaopms!6315
2022-11-23 05:43:50 +00:00
王怡栋 0f7d90ca2b Merge branch 'zentaopms_263_sort_features' 2022-11-23 13:43:10 +08:00
Yagami 49581d7ece * Finish task #77252. 2022-11-23 13:43:06 +08:00
王怡栋 6cd5d4c2d4 Merge branch 'master' into 'zentaopms_263_sort_features'
# Conflicts:
#   module/custom/config.php
2022-11-23 05:42:45 +00:00
王怡栋 d63eb75150 Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.

See merge request easycorp/zentaopms!6324
2022-11-23 05:40:47 +00:00
王怡栋 1e4b1f1aec Merge branch 'zentaopms_263_bug#30123' into 'master'
* Fix bug #30123.

See merge request easycorp/zentaopms!6325
2022-11-23 05:40:21 +00:00
孙广明 5eb34170f9 Merge branch 'master_xieqiyu_77254' into 'master'
* Fix bug#30026.

See merge request easycorp/zentaopms!6320
2022-11-23 05:40:03 +00:00
王怡栋 4f78b87c4c Merge branch 'tanghucheng_fixbug' into 'master'
* Fix feedback #1526.

See merge request easycorp/zentaopms!6327
2022-11-23 05:39:56 +00:00
王怡栋 cedec7a5e6 Merge branch 'zentaopms_263_bug_#30113' into 'master'
* Fix bug #30113.

See merge request easycorp/zentaopms!6326
2022-11-23 05:38:40 +00:00
tanghucheng bb8013fe7e * Fix feedback #1526. 2022-11-23 13:35:50 +08:00
daitingting d038c3126c * Fix bug #30113. 2022-11-23 05:23:25 +00:00
孙广明 39b7a4a41c Merge branch 'master_xieqiyu_77283' into 'master'
* Fix bug#30056.

See merge request easycorp/zentaopms!6309
2022-11-23 05:19:33 +00:00
孙广明 e60b156ea4 Merge branch 'master_zenops_wangjianhua' into 'master'
Modify Repo logic of shadow product.

See merge request easycorp/zentaopms!6317
2022-11-23 05:18:28 +00:00