 李玉春
|
6729298c92
|
Merge branch 'bugfix_cyy' into 'master'
Modify app language and API
See merge request easycorp/zentaopms!2488
|
2022-03-24 00:29:54 +00:00 |
|
|
王怡栋
|
7c8dcef938
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-23 17:28:59 +08:00 |
|
|
孙广明
|
85c0bedc77
|
Merge branch 'master_xieqiyu_21037' into 'master'
* Fix bug#21037.
See merge request easycorp/zentaopms!2480
|
2022-03-23 09:27:21 +00:00 |
|
|
王怡栋
|
2f0f2e2965
|
* adjust for js default value and init userview in upgrade.
|
2022-03-23 17:19:41 +08:00 |
|
|
王怡栋
|
f41e6c2932
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51328
See merge request easycorp/zentaopms!2489
|
2022-03-23 08:56:06 +00:00 |
|
|
王怡栋
|
181c0025a4
|
Merge branch 'sprint/tianshujie_bug_20653' into 'master'
* Fix bug #20653.
See merge request easycorp/zentaopms!2491
|
2022-03-23 08:55:50 +00:00 |
|
|
孙广明
|
c08b31e854
|
Merge branch 'sunhuawei_fixbug_11441' into 'master'
*Fix bug#11441.
See merge request easycorp/zentaopms!2479
|
2022-03-23 08:47:00 +00:00 |
|
|
tianshujie
|
ceeb1d17b8
|
* Fix bug #20653.
|
2022-03-23 16:46:20 +08:00 |
|
|
Zongjun Lan
|
fe7cbfbced
|
* fix task #51323
|
2022-03-23 16:36:15 +08:00 |
|
|
李玉春
|
21a6de6681
|
Merge branch 'devops24_zenggang' into 'master'
Finish task#51109,51108,51128
See merge request easycorp/zentaopms!2486
|
2022-03-23 08:31:17 +00:00 |
|
|
zenggang
|
1d9f6dd503
|
* Adjust code
|
2022-03-23 08:27:30 +00:00 |
|
|
caoyanyi
|
b7b3a26e33
|
* Add app language.
|
2022-03-23 16:26:51 +08:00 |
|
|
王怡栋
|
100c5e3506
|
Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* Fix bugs for kanban, include bug #17938, bug #19116, bug #18935, bug #18985, bug #19078.
See merge request easycorp/zentaopms!2482
|
2022-03-23 08:19:58 +00:00 |
|
|
王怡栋
|
fb917029b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #21032.
See merge request easycorp/zentaopms!2478
|
2022-03-23 08:17:24 +00:00 |
|
|
zenggang
|
1357480ac6
|
* Finish task#51109,51108,51128
|
2022-03-23 07:54:03 +00:00 |
|
|
Hao Sun
|
3e3e7d43f1
|
* optimize UI for cards sorting.
|
2022-03-23 15:00:34 +08:00 |
|
|
xieqiyu
|
e52f5c78b7
|
* Fix bug#21037.
|
2022-03-23 14:57:59 +08:00 |
|
|
孙华伟
|
ba1c42d0b5
|
*Fix bug#11441.
|
2022-03-23 14:54:35 +08:00 |
|
|
tanghucheng
|
c9fc9cfc65
|
* Fix bug #21032.
|
2022-03-23 14:28:33 +08:00 |
|
|
王怡栋
|
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 |
|
|
caoyanyi
|
19e7095e6c
|
* Fix bug #21075.
|
2022-03-23 13:11:39 +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 |
|