 孙广明
|
01de281380
|
Merge branch 'liyuchun_65983' into 'zenops_44'
* Fix bug when view code file.
See merge request easycorp/zentaopms!5170
|
2022-08-29 02:39:05 +00:00 |
|
|
liyuchun
|
24fcabe346
|
* Fix bug when view code file.
|
2022-08-29 10:27:46 +08:00 |
|
|
李玉春
|
bc233a7b8f
|
Merge branch 'cyy_repo' into 'zenops_44'
* Optimize page style.
See merge request easycorp/zentaopms!5162
|
2022-08-29 00:29:52 +00:00 |
|
|
caoyanyi
|
41599f0975
|
* Add language
|
2022-08-27 20:49:34 +08:00 |
|
|
caoyanyi
|
3554c514c6
|
* Optimize page style.
|
2022-08-27 10:38:35 +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 |
|
|
李玉春
|
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 |
|
|
liyuchun
|
61c88f627c
|
* Finish task #65979,65978,65977.
|
2022-08-26 14:06:01 +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 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
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 |
|
|
liumengyi
|
3805d90035
|
* Fix bug for action.
|
2022-08-26 09:17:07 +08:00 |
|
|
wangyidong
|
13361f4b5a
|
* fix bug #26866.
|
2022-08-26 09:15:55 +08:00 |
|
|
xieqiyu
|
dedf5e6dc2
|
* Delete reset file name of story change page.
|
2022-08-26 09:14:16 +08:00 |
|
|
caoyanyi
|
a466aa32d7
|
* Modify editor linked content style.
|
2022-08-26 09:12:43 +08:00 |
|
|
tanghucheng
|
827d6f5082
|
* Fix bug #26903 and Fix todo unit test.
|
2022-08-26 09:09:45 +08:00 |
|
|
xieqiyu
|
2753d2d60b
|
* Fix bug#26897.
|
2022-08-26 08:56:49 +08:00 |
|
|
liyuchun
|
79c1fe014a
|
* Code for task #65983.
|
2022-08-26 08:44:28 +08:00 |
|