Commit Graph
44302 Commits
Author SHA1 Message Date
tianshujie e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
tianshujie ae8f299b55 * Fix bug #26950. 2022-08-26 15:25:17 +08:00
tianshujie 12e8aebfb2 * Fix bug #26946. 2022-08-26 15:18:58 +08:00
孙广明 3fde178457 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5151
2022-08-26 07:12:18 +00:00
tianshujie db4a18e3bd * Methods to optimize execution modules. 2022-08-26 15:10:31 +08:00
tianshujie 1b61b51f97 * Add case for execution module. 2022-08-26 15:06:48 +08:00
孙广明 1800e4b046 Merge branch 'sprint/unittest_liumengyi_execution' into 'master'
* Add unit test of execution.

See merge request easycorp/zentaopms!5150
2022-08-26 07:03:11 +00:00
王怡栋 19b2168668 Merge branch 'master_xieqiyu_65696' into 'master'
Master xieqiyu 65696

See merge request easycorp/zentaopms!5148
2022-08-26 06:57:02 +00:00
王怡栋 f865fa9777 Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Update the changelog.

See merge request easycorp/zentaopms!5146
2022-08-26 06:55:52 +00:00
王怡栋 4adad82348 Merge branch 'master_liuhong_66212' into 'master'
*Fix bug #66212.

See merge request easycorp/zentaopms!5142
2022-08-26 06:55:36 +00:00
liumengyi cecf6460d7 * Add unit test of execution. 2022-08-26 14:51:49 +08:00
xieqiyu 0fdf8f06f8 * Fix bug#26942. 2022-08-26 14:51:11 +08:00
李玉春 754b84882e Merge branch 'cyy_api' into 'master'
* Modify product order and pager.

See merge request easycorp/zentaopms!5136
2022-08-26 06:13:20 +00:00
xieqiyu b11a645f00 * Fix bug#26941. 2022-08-26 14:09:28 +08:00
xieqiyu 40159e0ef9 * Fix bug#26940. 2022-08-26 14:05:22 +08:00
hufangzhou 5983b027ad * Update the changelog. 2022-08-26 14:03:38 +08:00
xieqiyu 79dc902ddd * Finish task#65696. 2022-08-26 13:58:56 +08:00
liuhong 4e634ef495 *Fix bug #66212. 2022-08-26 05:25:32 +00:00
王怡栋 705025b96c Merge branch 'sprint/231_zg_bugs' into 'master'
* Fix sprint231 bugs

See merge request easycorp/zentaopms!5145
2022-08-26 05:13:01 +00:00
王怡栋 c102deddbb Merge branch 'fixbug' into 'master'
* Fix bug #26906.

See merge request easycorp/zentaopms!5143
2022-08-26 05:12:23 +00:00
王怡栋 eaa366c64a Merge branch 'master_liuhong_66232' into 'master'
Fix bug #66232.

See merge request easycorp/zentaopms!5144
2022-08-26 05:11:51 +00:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
liuhong 04611bb5cc Fix bug #66232. 2022-08-26 03:31:58 +00:00
tanghucheng 24dab5df38 * Fix bug #26906. 2022-08-26 11:30:14 +08:00
liuhong 0e058dc8e3 *Fix bug #66212. 2022-08-26 02:38:19 +00:00
孙广明 7bd4ace927 Merge branch 'sprint/scx_programapi' into 'master'
*Fix program api bug.

See merge request easycorp/zentaopms!5087
2022-08-26 02:19:50 +00:00
孙广明 6910a89f30 Merge branch 'sprint/231_liumengyi_26916' into 'master'
* Fix bug #26916.

See merge request easycorp/zentaopms!5138
2022-08-26 02:18:55 +00:00
孙广明 df0875ced3 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5140
2022-08-26 02:18:27 +00:00
王怡栋 15c044a0f2 Merge branch 'sprint/hufangzhou_maxVersion' into 'master'
* Modify the max version.

See merge request easycorp/zentaopms!5141
2022-08-26 02:15:58 +00:00
王怡栋 30eebcede1 Merge branch 'sprint/ZUI_guofeilong_add_icon_blame' into 'master'
* zentaoIcon: add icon-blame

See merge request easycorp/zentaopms!5139
2022-08-26 02:15:45 +00:00
孙广明 1bc5169d8e Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug for action.

See merge request easycorp/zentaopms!5137
2022-08-26 02:14:55 +00:00
hufangzhou 6a77010b1d * Modify the max version. 2022-08-26 10:12:58 +08:00
tianshujie 44e31923f7 * Fix bug #26918. 2022-08-26 10:12:12 +08:00
王怡栋 7ad4d9edfe Merge branch 'master_liuhong_66222' into 'master'
*Fix bug #66222.

See merge request easycorp/zentaopms!5132
2022-08-26 02:10:26 +00:00
王怡栋 5580dd55d9 Merge branch 'master_liuhong' into 'master'
*Fix bug

See merge request easycorp/zentaopms!5122
2022-08-26 02:10:06 +00:00
guofeilong 6712743c25 * zentaoIcon: add icon-blame 2022-08-26 02:09:07 +00:00
liuhong c14d0ed155 *Fix bug before #64879. 2022-08-26 02:04:50 +00:00
tianshujie d4b043d72d * Fix bug #26902. 2022-08-26 09:56:57 +08:00
liumengyi 3da9fdd18c * Fix bug #26916. 2022-08-26 09:49:54 +08:00
liuhong 18f392ac88 *Fix bug #66222. 2022-08-26 01:48:39 +00:00
tianshujie 7aeaaeb573 * Fix bug #26888. 2022-08-26 09:43:50 +08:00
wangyidong f0e93ff16f Merge branch 'sprint/231_zg_issues' 2022-08-26 09:36:15 +08:00
王怡栋 f0aa2a0111 Merge branch 'master' into 'sprint/231_zg_issues'
# Conflicts:
#   module/story/lang/zh-cn.php
2022-08-26 01:35:56 +00:00
王怡栋 81a09eef67 Merge branch 'master_liuhong_26230' into 'master'
*Fix bug before 26230.

See merge request easycorp/zentaopms!5131
2022-08-26 01:25:35 +00:00
zenggang cf0be65b70 * Adjust code 2022-08-26 01:25:14 +00:00
王怡栋 72d09587b5 Merge branch 'autotest' into 'master'
* Fix bug #26903 and Fix todo unit test.

See merge request easycorp/zentaopms!5133
2022-08-26 01:25:07 +00:00
tianshujie 6b671ddd1e * Fix bug #26852. 2022-08-26 09:23:05 +08:00
王怡栋 38dd8fdac2 Merge branch 'master_xieqiyu_fixFileBug' into 'master'
* Delete reset file name of story change page.

See merge request easycorp/zentaopms!5135
2022-08-26 01:22:42 +00:00
王怡栋 6389b9dfa2 Merge branch 'master_xieqiyu_26881' into 'master'
* Fix bug#26881.

See merge request easycorp/zentaopms!5126
2022-08-26 01:21:51 +00:00
王怡栋 7b8333da4e Merge branch 'master_xieqiyu_26878' into 'master'
* Fix bug#26878.

See merge request easycorp/zentaopms!5123
2022-08-26 01:21:00 +00:00