孙广明
|
5b759d1676
|
Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5155
|
2022-08-26 07:46:16 +00:00 |
|
王怡栋
|
69674273fe
|
Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug
See merge request easycorp/zentaopms!5154
|
2022-08-26 07:45:42 +00:00 |
|
tianshujie
|
eb6b6b061f
|
* Fix bug #26950.
|
2022-08-26 15:34:18 +08:00 |
|
liumengyi
|
18efebc505
|
* Fix bug.
|
2022-08-26 15:33:46 +08:00 |
|
tianshujie
|
e45c8da5c8
|
* Fix bug #26954.
|
2022-08-26 15:32:33 +08:00 |
|
lanzongjun
|
0e77885d3c
|
success my and weekly
|
2022-08-26 15:28:19 +08:00 |
|
tianshujie
|
ae8f299b55
|
* Fix bug #26950.
|
2022-08-26 15:25:17 +08:00 |
|
王怡栋
|
7345d4e036
|
Merge branch 'fix_bug#26945' into 'master'
* Fix bug #26945.
See merge request easycorp/zentaopms!5153
|
2022-08-26 07:23:28 +00:00 |
|
mayue
|
3952e3d312
|
* Fix bug #26945.
|
2022-08-26 15:22:00 +08:00 |
|
王怡栋
|
5077173b8b
|
Merge branch 'master_xieqiyu_26898' into 'master'
* Fix bug#26898.
See merge request easycorp/zentaopms!5152
|
2022-08-26 07:21:30 +00:00 |
|
tianshujie
|
12e8aebfb2
|
* Fix bug #26946.
|
2022-08-26 15:18:58 +08:00 |
|
xieqiyu
|
edfb5c538c
|
* Fix bug#26898.
|
2022-08-26 15:16:50 +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 |
|
孙广明
|
f69e5c0ce0
|
Merge branch 'liyuchun_65983' into 'zenops_44'
Liyuchun 65983
See merge request easycorp/zentaopms!5147
|
2022-08-26 06:35:25 +00:00 |
|
liyuchun
|
1f6eae4545
|
* Edit editor height.
|
2022-08-26 14:34:26 +08:00 |
|
liyuchun
|
33e0de2cdc
|
Merge branch 'zenops_44' into liyuchun_65983
|
2022-08-26 14:28:47 +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 |
|
李玉春
|
84f346f413
|
Merge branch 'cyy_repo_editor' into 'zenops_44'
* Modify editor linked content style.
See merge request easycorp/zentaopms!5134
|
2022-08-26 06:12:59 +00:00 |
|
xieqiyu
|
b11a645f00
|
* Fix bug#26941.
|
2022-08-26 14:09:28 +08:00 |
|
liyuchun
|
61c88f627c
|
* Finish task #65979,65978,65977.
|
2022-08-26 14:06:01 +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 |
|
caoyanyi
|
a3cbaafafd
|
Merge branch 'master' into zenops_44
|
2022-08-26 13:38:13 +08:00 |
|
caoyanyi
|
7e9454c815
|
* Modify icon and page style.
|
2022-08-26 13:37:24 +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 |
|
lanzongjun
|
9b13b72041
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/lanzongjun_testunit
|
2022-08-26 10:50:23 +08:00 |
|
lanzongjun
|
39fc85664d
|
success user module
|
2022-08-26 10:49:59 +08:00 |
|
liuhong
|
0e058dc8e3
|
*Fix bug #66212.
|
2022-08-26 02:38:19 +00:00 |
|
lanzongjun
|
27f279a616
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-08-26 10:23:15 +08: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 |
|