 dongli
|
c93028b04e
|
* Fix bug #66816.
|
2022-08-30 03:00:07 +00:00 |
|
|
dongli
|
914ab9d955
|
* Delete useless files.
|
2022-08-28 13:28:59 +00:00 |
|
|
dongli
|
25fe8cd518
|
* Fix bug #24387.
|
2022-08-28 11:57:16 +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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
liuhong
|
c14d0ed155
|
*Fix bug before #64879.
|
2022-08-26 02:04:50 +00: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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
xieqiyu
|
6717931bf5
|
* Fix bug#26878.
|
2022-08-26 08:07:40 +08:00 |
|
|
liuhong
|
63fa2567dc
|
*Fix bug #66222.
|
2022-08-25 22:22:37 +00:00 |
|
|
liuhong
|
e9d398addd
|
*Fix bug before 26230.
|
2022-08-25 09:15:12 +00:00 |
|
|
孙广明
|
259e8e2e84
|
Merge branch 'sprint/max43_mayue_bug#26607' into 'master'
* Fix bug #26607.
See merge request easycorp/zentaopms!5119
|
2022-08-25 09:10:28 +00:00 |
|
|
mayue
|
b3008f2d19
|
* Optimize code.
|
2022-08-25 17:08:06 +08:00 |
|
|
李玉春
|
f36224ffbc
|
Merge branch 'sprint/231_tianshujie_26882' into 'master'
* Fix bug #26882.
See merge request easycorp/zentaopms!5130
|
2022-08-25 09:03:09 +00:00 |
|
|
tianshujie
|
8ddddc63db
|
* Fix bug #26882.
|
2022-08-25 17:00:41 +08:00 |
|
|
mayue
|
bc938caaa4
|
* Fix bug #26607.
|
2022-08-25 16:55:27 +08:00 |
|
|
李玉春
|
2f6407945c
|
Merge branch 'sprint/231_liumengyi_26784' into 'master'
* Fix bug #26784.
See merge request easycorp/zentaopms!5129
|
2022-08-25 08:50:08 +00:00 |
|
|
tianshujie
|
1e59fbd311
|
* Fix bug #26882.
|
2022-08-25 16:48:00 +08:00 |
|
|
王怡栋
|
8a7cceaaa5
|
Merge branch 'master_xieqiyu_26873' into 'master'
* Fix bug#26873.
See merge request easycorp/zentaopms!5120
|
2022-08-25 08:19:40 +00:00 |
|
|
liumengyi
|
769e701d7c
|
* Fix bug #26784.
|
2022-08-25 16:13:50 +08:00 |
|
|
tanghucheng
|
8e93a462f6
|
* Fix bug for upload file.
|
2022-08-25 16:10:13 +08:00 |
|
|
zenggang
|
bf24ce64fd
|
* Fix sprint/231 issues
|
2022-08-25 07:49:02 +00:00 |
|
|
tanghucheng
|
a90b732c36
|
* Fix bug #26886.
|
2022-08-25 15:46:38 +08:00 |
|
|
孙广明
|
1e65a7fd23
|
Merge branch 'sprint/231_liumengyi_26887' into 'master'
* Fix bug #26887.
See merge request easycorp/zentaopms!5124
|
2022-08-25 07:45:02 +00:00 |
|