 王怡栋
|
48e11d5186
|
Merge branch 'sprint/hufangzhou_26458' into 'master'
* Fix bug #26458.
See merge request easycorp/zentaopms!5230
|
2022-09-01 06:53:53 +00:00 |
|
|
王怡栋
|
58c0d43da5
|
Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955
See merge request easycorp/zentaopms!5219
|
2022-09-01 03:05:12 +00:00 |
|
|
xieqiyu
|
16094e64d4
|
* Optimize code.
|
2022-09-01 11:04:08 +08:00 |
|
|
hufangzhou
|
def6b278e9
|
* Fix bug #26458.
|
2022-09-01 10:50:45 +08:00 |
|
|
xieqiyu
|
d552aa67f9
|
* Code for task#66955.
|
2022-09-01 10:47:58 +08:00 |
|
|
lanzongjun
|
07c97f4072
|
modify processed
|
2022-09-01 09:40:57 +08:00 |
|
|
lanzongjun
|
71cd04f05d
|
modify processed
|
2022-09-01 09:37:59 +08:00 |
|
|
lanzongjun
|
11ace1e2da
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-09-01 09:11:23 +08:00 |
|
|
lanzongjun
|
1a65713332
|
* finish task #66992
|
2022-09-01 09:11:10 +08:00 |
|
|
xieqiyu
|
e6bc611d14
|
* Finish task#66955.
|
2022-08-31 19:20:02 +08:00 |
|
|
xieqiyu
|
b026b7c494
|
* Code for task#66955.
|
2022-08-31 18:27:42 +08:00 |
|
|
李玉春
|
0bc581b21c
|
Merge branch 'sprint/235' into 'master'
Sprint/235
See merge request easycorp/zentaopms!5216
|
2022-08-31 08:19:32 +00:00 |
|
|
tianshujie
|
b9190b8d92
|
* Solve bug link bug search all products reported errors.
|
2022-08-30 15:14:36 +08:00 |
|
|
zenggang
|
6c48f5ec97
|
* Finish task#67260
|
2022-08-30 06:39:36 +00:00 |
|
|
王怡栋
|
c6f4f5445f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug flex
See merge request easycorp/zentaopms!5196
|
2022-08-30 06:36:30 +00:00 |
|
|
lanzongjun
|
8dc6585522
|
* fix bug flex
|
2022-08-30 14:35:05 +08:00 |
|
|
zenggang
|
062af71ff8
|
* Fix sprint231 bugs
|
2022-08-29 07:23:32 +00:00 |
|
|
王怡栋
|
61999b0462
|
Merge branch 'master_xieqiyu_26991' into 'master'
* Fix bug#26991.
See merge request easycorp/zentaopms!5179
|
2022-08-29 05:38:16 +00:00 |
|
|
王怡栋
|
20ac7bdecb
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26983
See merge request easycorp/zentaopms!5175
|
2022-08-29 05:32:26 +00:00 |
|
|
xieqiyu
|
97369a949c
|
* Fix bug#26897.
|
2022-08-29 13:31:54 +08:00 |
|
|
lanzongjun
|
c26a7c3a3a
|
* fix bug #26990
|
2022-08-29 13:28:13 +08:00 |
|
|
xieqiyu
|
fe9228b394
|
* Fix bug#26897.
|
2022-08-29 13:26:58 +08:00 |
|
|
xieqiyu
|
c3ba9e70ae
|
* Fix bug#26897.
|
2022-08-29 13:26:11 +08:00 |
|
|
lanzongjun
|
e8ffd8d912
|
* fix bug #26983
|
2022-08-29 11:13:46 +08:00 |
|
|
曾刚
|
72194dcc1a
|
* Fix bug#26939
|
2022-08-29 02:55:19 +00:00 |
|
|
zenggang
|
494474d349
|
* Fix sprint231 bugs
|
2022-08-26 05:10:26 +00: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 |
|
|
liuhong
|
18f392ac88
|
*Fix bug #66222.
|
2022-08-26 01:48:39 +00: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 |
|
|
王怡栋
|
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 |
|
|
xieqiyu
|
2753d2d60b
|
* Fix bug#26897.
|
2022-08-26 08:56:49 +08:00 |
|
|
liuhong
|
63fa2567dc
|
*Fix bug #66222.
|
2022-08-25 22:22:37 +00:00 |
|
|
liumengyi
|
769e701d7c
|
* Fix bug #26784.
|
2022-08-25 16:13:50 +08:00 |
|
|
zenggang
|
bf24ce64fd
|
* Fix sprint/231 issues
|
2022-08-25 07:49:02 +00:00 |
|
|
hufangzhou
|
e55c40278d
|
* Add the new version.
|
2022-08-25 09:31:18 +08:00 |
|
|
王怡栋
|
297a416762
|
Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
# module/story/control.php
|
2022-08-25 00:51:00 +00:00 |
|
|
王怡栋
|
00b8ffc6f7
|
Merge branch 'sprint/unittest_liumengyi_bug' into 'master'
* Unit test of bug.
See merge request easycorp/zentaopms!4993
|
2022-08-24 05:47:55 +00:00 |
|
|
zenggang
|
c424e450cb
|
* Adjust code
|
2022-08-24 03:28:59 +00:00 |
|
|
zenggang
|
73c8091a82
|
* Finish task#65782,65779
|
2022-08-24 03:24:03 +00:00 |
|
|
tianshujie
|
3a99afd287
|
* Finish task #65808,65807.
|
2022-08-23 16:12:52 +08:00 |
|
|
tianshujie
|
44d270da18
|
* Finish task #65808.
|
2022-08-23 15:48:20 +08:00 |
|
|
tianshujie
|
dca2784559
|
* Finish task #65808.
|
2022-08-23 15:02:57 +08:00 |
|
|
liumengyi
|
545d74f7d0
|
* Optimize code for task #65808, #65807.
|
2022-08-23 14:50:40 +08:00 |
|
|
tianshujie
|
4e1ca8bd60
|
* Finish task #65808.
|
2022-08-23 13:40:34 +08:00 |
|
|
liumengyi
|
20041ea696
|
* Fix bug #26723.
|
2022-08-22 11:12:38 +08:00 |
|
|
曾刚
|
caed6b27cd
|
Fix bug#26664
|
2022-08-19 05:10:19 +00:00 |
|
|
tianshujie
|
88eb976835
|
* Finish task #63687.
|
2022-08-18 16:12:16 +08:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
9cd4212ef7
|
i* Finish task #63696.
|
2022-08-18 10:23:41 +08:00 |
|
|
liumengyi
|
63c69a104e
|
* Unit test of bug.
|
2022-08-17 14:35:27 +08:00 |
|