 zenggang
|
1d9f6dd503
|
* Adjust code
|
2022-03-23 08:27:30 +00:00 |
|
|
zenggang
|
1357480ac6
|
* Finish task#51109,51108,51128
|
2022-03-23 07:54:03 +00:00 |
|
|
王怡栋
|
b86c3a2a59
|
Merge branch 'sprint/hufangzhou_multipleConcurrency' into 'master'
* Modify the makefile for multiple concurrency.
See merge request easycorp/zentaopms!2484
|
2022-03-23 07:36:15 +00:00 |
|
|
hufangzhou
|
839e73afd5
|
* Modify the makefile for multiple concurrency.
|
2022-03-23 15:23:07 +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 |
|
|
王怡栋
|
8daf73d131
|
Merge branch 'sprint/fixbug_hufangzhou_xuanxuan' into 'master'
* Temporary fix the navigation of xuanxuan conference.
See merge request easycorp/zentaopms!2476
|
2022-03-23 06:21:45 +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 |
|
|
李玉春
|
2440d793e0
|
Merge branch 'sprint/zenops24_lwr_tweak_xuan_web_client' into 'master'
Tweak xuan web client.
See merge request easycorp/zentaopms!2475
|
2022-03-23 06:17:15 +00:00 |
|
|
李玉春
|
19363cc6bf
|
Merge branch 'sprint/tianshujie_20653' into 'master'
* Fix bug #20653.
See merge request easycorp/zentaopms!2477
|
2022-03-23 06:16:36 +00:00 |
|
|
tianshujie
|
5e7034e5c1
|
* Fix bug #20653.
|
2022-03-23 14:11:25 +08:00 |
|
|
hufangzhou
|
cebdf93777
|
* Temporary fix the navigation of xuanxuan conference.
|
2022-03-23 13:59:24 +08:00 |
|
|
Wenrui LI
|
921037fda2
|
* fix no colon before port.
|
2022-03-23 13:54:46 +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 |
|
|
Wenrui LI
|
cff19cb7be
|
* disable web chat when xxd is offline, and prevent web client from guessing urls, task #50925, bug #18927.
|
2022-03-23 13:52:45 +08: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 |
|
|
Wenrui LI
|
9424577291
|
* change client to chat, and remove xuan promotional message, task #51510.
|
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 |
|
|
liyuchun
|
0667e56934
|
Merge branch 'fixbug_cyy'
|
2022-03-23 11:37:35 +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 |
|
|
李玉春
|
a9cb7525f2
|
Merge branch 'sprint/scx_recordDemandEstimate' into 'master'
*Fix record task estimate bug.
See merge request easycorp/zentaopms!2470
|
2022-03-23 03:30:22 +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 |
|
|
songchenxuan
|
7640969169
|
*Fix record task estimate bug.
|
2022-03-23 11:28:50 +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 |
|
|
朱金勇
|
b7d1948967
|
Merge branch 'app_zhengrunyu' into 'master'
* Change api for create bug and change stroy.
See merge request easycorp/zentaopms!2467
|
2022-03-23 02:45:34 +00:00 |
|
|
liyuchun
|
1a43612090
|
* Fix bug #19656.
|
2022-03-23 10:44:56 +08:00 |
|
|
zhengrunyu
|
ba77087ac3
|
* Change api for create bug and change stroy.
|
2022-03-23 10:41:50 +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 |
|