 王怡栋
|
2cd292eedf
|
Merge branch 'zentaopms_263_bug#29641' into 'master'
* Fix bug #29641.
See merge request easycorp/zentaopms!6321
|
2022-11-23 05:45:06 +00:00 |
|
|
王怡栋
|
476ceeaa6a
|
Merge branch 'bug_27991' into 'master'
Bug 27991
See merge request easycorp/zentaopms!6319
|
2022-11-23 05:44:52 +00:00 |
|
|
Yagami
|
307e9c5f62
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-23 13:44:25 +08:00 |
|
|
王怡栋
|
838f499ca6
|
Merge branch 'zentaopms_263_bug_#30104' into 'master'
* Fix bug #30104.
See merge request easycorp/zentaopms!6318
|
2022-11-23 05:44:05 +00:00 |
|
|
王怡栋
|
3dd409514c
|
Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.
See merge request easycorp/zentaopms!6315
|
2022-11-23 05:43:50 +00:00 |
|
|
王怡栋
|
0f7d90ca2b
|
Merge branch 'zentaopms_263_sort_features'
|
2022-11-23 13:43:10 +08:00 |
|
|
Yagami
|
49581d7ece
|
* Finish task #77252.
|
2022-11-23 13:43:06 +08:00 |
|
|
王怡栋
|
6cd5d4c2d4
|
Merge branch 'master' into 'zentaopms_263_sort_features'
# Conflicts:
# module/custom/config.php
|
2022-11-23 05:42:45 +00:00 |
|
|
王怡栋
|
d63eb75150
|
Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.
See merge request easycorp/zentaopms!6324
|
2022-11-23 05:40:47 +00:00 |
|
|
王怡栋
|
1e4b1f1aec
|
Merge branch 'zentaopms_263_bug#30123' into 'master'
* Fix bug #30123.
See merge request easycorp/zentaopms!6325
|
2022-11-23 05:40:21 +00:00 |
|
|
孙广明
|
5eb34170f9
|
Merge branch 'master_xieqiyu_77254' into 'master'
* Fix bug#30026.
See merge request easycorp/zentaopms!6320
|
2022-11-23 05:40:03 +00:00 |
|
|
王怡栋
|
4f78b87c4c
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix feedback #1526.
See merge request easycorp/zentaopms!6327
|
2022-11-23 05:39:56 +00:00 |
|
|
王怡栋
|
cedec7a5e6
|
Merge branch 'zentaopms_263_bug_#30113' into 'master'
* Fix bug #30113.
See merge request easycorp/zentaopms!6326
|
2022-11-23 05:38:40 +00:00 |
|
|
tanghucheng
|
bb8013fe7e
|
* Fix feedback #1526.
|
2022-11-23 13:35:50 +08:00 |
|
|
daitingting
|
d038c3126c
|
* Fix bug #30113.
|
2022-11-23 05:23:25 +00:00 |
|
|
孙广明
|
39b7a4a41c
|
Merge branch 'master_xieqiyu_77283' into 'master'
* Fix bug#30056.
See merge request easycorp/zentaopms!6309
|
2022-11-23 05:19:33 +00:00 |
|
|
孙广明
|
e60b156ea4
|
Merge branch 'master_zenops_wangjianhua' into 'master'
Modify Repo logic of shadow product.
See merge request easycorp/zentaopms!6317
|
2022-11-23 05:18:28 +00:00 |
|
|
孙广明
|
31dc028cff
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77263#77267 Bug #30022
See merge request easycorp/zentaopms!6310
|
2022-11-23 05:18:07 +00:00 |
|
|
王怡栋
|
db4bd4ebd6
|
* fix bug #29996.
|
2022-11-23 13:12:53 +08:00 |
|
|
zenggang
|
4609340b65
|
* Fix bug#29765
|
2022-11-23 05:09:52 +00:00 |
|
|
wangyuting
|
887afd1a5c
|
* Fix bug #30123.
|
2022-11-23 03:18:45 +00:00 |
|
|
wangyuting
|
dcab55d0fd
|
* Fix bug #30130.
|
2022-11-23 03:15:14 +00:00 |
|
|
daitingting
|
f4d756e8c6
|
* Sort features.
|
2022-11-23 03:11:52 +00:00 |
|
|
王怡栋
|
d98c9413f0
|
* fix bug #30074.
|
2022-11-23 11:09:47 +08:00 |
|
|
wangyuting
|
c2887ff921
|
* Fix bug #29641.
|
2022-11-23 03:02:07 +00:00 |
|
|
zenggang
|
a0bda0eaa0
|
* Adjust code
|
2022-11-23 02:56:57 +00:00 |
|
|
zenggang
|
748323efe0
|
* Fix bug#27991 and adjust code
|
2022-11-23 02:55:03 +00:00 |
|
|
lanzongjun
|
63e0556741
|
* Fix Task #77267
|
2022-11-23 10:54:58 +08:00 |
|
|
xieqiyu
|
bfafc2996d
|
* Fix bug#30026.
|
2022-11-23 10:54:51 +08:00 |
|
|
daitingting
|
8b35153a3c
|
* Fix bug #30104.
|
2022-11-23 02:42:41 +00:00 |
|
|
王怡栋
|
23e9d91bf9
|
Merge branch 'zentaopms_263_task_#77137' into 'master'
* Disabled current mode button.
See merge request easycorp/zentaopms!6316
|
2022-11-23 02:35:42 +00:00 |
|
|
daitingting
|
d7bd0481a5
|
* Disabled current mode button.
|
2022-11-23 02:28:34 +00:00 |
|
|
wangjianhua
|
36051c118c
|
* Hide product when create Repo in project module.
|
2022-11-23 10:22:37 +08:00 |
|
|
liugang
|
08748eb7d4
|
Merge branch 'guanxiying/zentaopms-master'
|
2022-11-23 10:09:31 +08:00 |
|
|
wangyuting
|
9b3e52ac3b
|
* Optimize project build css.
|
2022-11-23 02:02:13 +00:00 |
|
|
王怡栋
|
fb86a78032
|
* fix bug #30124.
|
2022-11-23 10:00:41 +08:00 |
|
|
lanzongjun
|
60051b2646
|
* Fix Bug #30022
|
2022-11-23 09:56:20 +08:00 |
|
|
王怡栋
|
cc0fb8eeef
|
Merge branch 'master_bug_23269' into 'master'
* Fix bug #23269.
See merge request easycorp/zentaopms!6306
|
2022-11-23 01:55:01 +00:00 |
|
|
王怡栋
|
abca6db236
|
Merge branch 'zentaopms_263_bug#30045' into 'master'
* Fix bug #30045.
See merge request easycorp/zentaopms!6308
|
2022-11-23 01:54:26 +00:00 |
|
|
王怡栋
|
1c008655e1
|
Merge branch 'zentaopms_263_bug#29994' into 'master'
* Fix bug #29994.
See merge request easycorp/zentaopms!6311
|
2022-11-23 01:53:52 +00:00 |
|
|
王怡栋
|
c82784f408
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code with review code.
See merge request easycorp/zentaopms!6312
|
2022-11-23 01:53:20 +00:00 |
|
|
王怡栋
|
f53e8d7664
|
Merge branch 'zentaopms_263_task_#77137' into 'master'
* Finish task #77137.
See merge request easycorp/zentaopms!6313
|
2022-11-23 01:52:41 +00:00 |
|
|
wangyuting
|
f7225b0170
|
* Optimize code with review code.
|
2022-11-23 01:44:59 +00:00 |
|
|
daitingting
|
7f19feff3a
|
* Finish task #77137.
|
2022-11-23 01:43:12 +00:00 |
|
|
wangyuting
|
5835a11610
|
* Fix bug #29994.
|
2022-11-23 01:40:30 +00:00 |
|
|
lanzongjun
|
13d7490288
|
* Fix Task #77263
|
2022-11-23 09:39:10 +08:00 |
|
|
xieqiyu
|
37122bb5a8
|
* Fix bug#30056.
|
2022-11-23 09:34:21 +08:00 |
|
|
孙广明
|
dc4333ef34
|
Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Optimize code about bug #29945.
See merge request easycorp/zentaopms!6307
|
2022-11-23 01:31:04 +00:00 |
|
|
wangyuting
|
63a249eeca
|
* Fix bug #30045.
|
2022-11-23 01:29:34 +00:00 |
|
|
mayue
|
410b839c15
|
* Optimize code about bug #29945.
|
2022-11-23 09:29:30 +08:00 |
|