 王怡栋
|
c2d1285a2b
|
Merge branch 'sprint/lite6_lwr_tweak_chat' into 'master'
Tweak chat, rename xuan to chat and disable by default.
See merge request easycorp/zentaopms!2474
|
2022-03-23 06:23:06 +00:00 |
|
|
王怡栋
|
3fb42d9983
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51317
See merge request easycorp/zentaopms!2463
|
2022-03-23 06:22:15 +00:00 |
|
|
王怡栋
|
a83c92fc96
|
Merge branch 'sprint/fixbug_hufangzhou_14233' into 'master'
* Fix bug #14233.
See merge request easycorp/zentaopms!2471
|
2022-03-23 06:21:21 +00:00 |
|
|
王怡栋
|
43d45de812
|
Merge branch 'sprint/fixbug_hufangzhou_16207' into 'master'
* Fix bug #16207.
See merge request easycorp/zentaopms!2464
|
2022-03-23 06:20:37 +00:00 |
|
|
tianshujie
|
5e7034e5c1
|
* Fix bug #20653.
|
2022-03-23 14:11:25 +08:00 |
|
|
孙广明
|
337f12b7e3
|
Merge branch 'master_xieqiyu_20930' into 'master'
* Fix bug#20930.
See merge request easycorp/zentaopms!2462
|
2022-03-23 05:53:02 +00:00 |
|
|
孙广明
|
62e7ad71fc
|
Merge branch 'liyuchun_bug_20430' into 'master'
Fix bug #19644,19662,19680,20430.
See merge request easycorp/zentaopms!2466
|
2022-03-23 05:51:57 +00:00 |
|
|
Zongjun Lan
|
b76661202c
|
remove code
|
2022-03-23 13:49:20 +08:00 |
|
|
Wenrui LI
|
2365794124
|
* disable chat by default, task #51509.
|
2022-03-23 13:36:11 +08:00 |
|
|
李玉春
|
14d8417580
|
Merge branch 'sprint/master_zhouxudong_17053' into 'master'
* Fix bug #17053.
See merge request easycorp/zentaopms!2473
|
2022-03-23 05:34:22 +00:00 |
|
|
zhouxudong
|
9acef59ced
|
* Fix bug #17053.
|
2022-03-23 13:31:52 +08:00 |
|
|
Zongjun Lan
|
882395351a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_version_lite
|
2022-03-23 13:24:28 +08:00 |
|
|
孙广明
|
1825eeb881
|
Merge branch 'fixbug_sunjun_17627' into 'master'
Fixbug sunjun 17627
See merge request easycorp/zentaopms!2472
|
2022-03-23 05:08:57 +00:00 |
|
|
sunjun
|
f46cbe2524
|
*Fixbug #17627
|
2022-03-23 13:07:06 +08:00 |
|
|
李玉春
|
8992b0acca
|
Merge branch 'master' into 'fixbug_cyy'
# Conflicts:
# module/install/model.php
|
2022-03-23 05:04:41 +00:00 |
|
|
caoyanyi
|
203a3607d8
|
* Adjust codes.
|
2022-03-23 11:32:56 +08:00 |
|
|
sunjun
|
a049bfb817
|
*Fixbug 17627
|
2022-03-23 11:32:07 +08:00 |
|
|
李玉春
|
1cb7e1a05f
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2468
|
2022-03-23 03:30:58 +00:00 |
|
|
tianshujie
|
a66d11f667
|
* Modify the code judgment logic.
|
2022-03-23 11:30:14 +08:00 |
|
|
hufangzhou
|
350c84440e
|
* Fix bug #14233.
|
2022-03-23 11:29:55 +08:00 |
|
|
朱金勇
|
e0d07d0fc8
|
Merge branch 'sgm_autotest' into 'master'
Sgm autotest
See merge request easycorp/zentaopms!2469
|
2022-03-23 03:27:30 +00:00 |
|
|
孙广明
|
6b29237415
|
* Fix bug.
|
2022-03-23 11:25:31 +08:00 |
|
|
tianshujie
|
890c669631
|
* Modify the code judgment logic.
|
2022-03-23 11:23:45 +08:00 |
|
|
sunjun
|
0fe1276953
|
*Fixbug #17627
|
2022-03-23 11:10:44 +08:00 |
|
|
liyuchun
|
14e92b0825
|
* Fix bug #19511.
|
2022-03-23 11:07:45 +08:00 |
|
|
tianshujie
|
7386bc503a
|
* Fix bug #20744.
|
2022-03-23 11:07:24 +08:00 |
|
|
sunjun
|
0cc256d221
|
*Fixbug #17627
|
2022-03-23 11:06:26 +08:00 |
|
|
王怡栋
|
39c46536f1
|
* code for task #51327.
|
2022-03-23 11:05:58 +08:00 |
|
|
王怡栋
|
45b5857ac8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-23 10:55:47 +08:00 |
|
|
王怡栋
|
d71568e98d
|
* code for task #51327.
|
2022-03-23 10:55:05 +08:00 |
|
|
liyuchun
|
1a43612090
|
* Fix bug #19656.
|
2022-03-23 10:44:56 +08:00 |
|
|
liyuchun
|
9e14fa59e7
|
* Fix bug #19581.
|
2022-03-23 10:35:49 +08:00 |
|
|
tianshujie
|
a4ac9d457a
|
* Fix bug #21082.
|
2022-03-23 10:28:59 +08:00 |
|
|
liyuchun
|
d322074653
|
* Fix bug #19644,19662,19680.
|
2022-03-23 10:21:22 +08:00 |
|
|
tianshujie
|
82e7beb7a0
|
* Fix bug #20923.
|
2022-03-23 10:20:55 +08:00 |
|
|
sunjun
|
69bb361319
|
*Fixbug #17627
|
2022-03-23 09:59:36 +08:00 |
|
|
hufangzhou
|
8b8b4f6989
|
* Fix bug #16207.
|
2022-03-23 09:58:09 +08:00 |
|
|
caoyanyi
|
39fbdad08a
|
* Fix bug #17620.
|
2022-03-23 09:50:06 +08:00 |
|
|
liyuchun
|
4882c5c6cd
|
* Fix bug #20430.
|
2022-03-23 09:39:10 +08:00 |
|
|
caoyanyi
|
290ff3677c
|
* Fix bug #18018.
|
2022-03-23 09:37:53 +08:00 |
|
|
caoyanyi
|
0961139ea4
|
* Fix bug #18017.
|
2022-03-23 09:14:27 +08:00 |
|
|
Zongjun Lan
|
560a9c7d4a
|
* fix task #51317
|
2022-03-23 09:11:27 +08:00 |
|
|
xieqiyu
|
c614eb44e4
|
* Fix bug#20930.
|
2022-03-23 09:03:41 +08:00 |
|
|
tianshujie
|
6dfcd7f992
|
* Fix bug #20919.
|
2022-03-23 08:53:50 +08:00 |
|
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
|
孙广明
|
dea5f09087
|
Merge branch 'fixbug_zhouxin_15517' into 'master'
* Fix bug #15517.
See merge request easycorp/zentaopms!2460
|
2022-03-22 09:26:27 +00:00 |
|
|
zhouxin
|
8d17a390c0
|
* Fix bug #15517.
|
2022-03-22 09:23:21 +00:00 |
|
|
孙广明
|
fd523bb183
|
Merge branch 'fixbug_zhouxin_18746' into 'master'
* Fix bug #18746.
See merge request easycorp/zentaopms!2456
|
2022-03-22 09:14:26 +00:00 |
|
|
李玉春
|
64e9667a1f
|
Merge branch 'sprint/master_zhouxudong_16718' into 'master'
* Fix bug #16718.
See merge request easycorp/zentaopms!2458
|
2022-03-22 08:55:17 +00:00 |
|
|
zhouxudong
|
e827209fe0
|
* Fix bug #16718.
|
2022-03-22 16:37:09 +08:00 |
|