 王怡栋
|
2f0f2e2965
|
* adjust for js default value and init userview in upgrade.
|
2022-03-23 17:19:41 +08:00 |
|
|
王怡栋
|
da33f252eb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-23 17:19:15 +08:00 |
|
|
王怡栋
|
d0db0db7bc
|
* adjust for get langs api.
|
2022-03-23 17:18:43 +08:00 |
|
|
朱金勇
|
5f1f55d874
|
Merge branch 'sprint/scx_storyestimate' into 'master'
*Record and get story efforts.
See merge request easycorp/zentaopms!2481
|
2022-03-23 08:59:16 +00: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 |
|
|
王怡栋
|
5921641367
|
Merge branch 'sprint/hufangzhou_xuanxuan' into 'master'
* Remove the code.
See merge request easycorp/zentaopms!2490
|
2022-03-23 08:55:31 +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 |
|
|
hufangzhou
|
2702366e56
|
* Remove the code.
|
2022-03-23 16:41:57 +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 |
|
|
songchenxuan
|
6d9d31ee5e
|
API routes.
|
2022-03-23 16:20:38 +08:00 |
|
|
王怡栋
|
b1adc7e106
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix bug #19605
See merge request easycorp/zentaopms!2487
|
2022-03-23 08:20:22 +00: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 |
|
|
Zongjun Lan
|
13fa3fe3d2
|
* fix bug #51317
|
2022-03-23 16:16:57 +08:00 |
|
|
songchenxuan
|
04b53492c0
|
*Edit comment.
|
2022-03-23 16:04:33 +08:00 |
|
|
孙广明
|
4489aa4389
|
Merge branch 'sprint/autoTest_liumengyi_todo'
|
2022-03-23 16:02:34 +08:00 |
|
|
孙广明
|
6e2325563f
|
Merge branch 'master' into 'sprint/autoTest_liumengyi_todo'
# Conflicts:
# test/data/todo.yaml
# test/ztest
|
2022-03-23 08:02:10 +00:00 |
|
|
孙广明
|
06ce541a55
|
Merge branch 'autotest_ly' into 'master'
add test by dept and data
See merge request easycorp/zentaopms!2485
|
2022-03-23 08:01: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 |
|
|
liyang
|
f4810a274e
|
add test by dept and data
|
2022-03-23 15:24:41 +08:00 |
|
|
hufangzhou
|
839e73afd5
|
* Modify the makefile for multiple concurrency.
|
2022-03-23 15:23:07 +08:00 |
|
|
liumengyi
|
7efb286b5a
|
* Add auto test of todo.
|
2022-03-23 15:16:38 +08:00 |
|
|
Hao Sun
|
3e3e7d43f1
|
* optimize UI for cards sorting.
|
2022-03-23 15:00:34 +08:00 |
|
|
songchenxuan
|
86128d1c0b
|
*Record and get story efforts.
|
2022-03-23 14:55: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 |
|
|
王怡栋
|
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 |
|