 zhouxin
|
7d0d641629
|
* Fix bug #20813.
|
2022-03-24 09:31:57 +00:00 |
|
|
zhouxin
|
eb977b865d
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into package
|
2022-03-24 08:57:23 +00:00 |
|
|
zhouxin
|
3291a491c9
|
Fix bug.
|
2022-03-24 08:55:56 +00:00 |
|
|
王怡栋
|
47318553e7
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-24 16:41:06 +08:00 |
|
|
王怡栋
|
5831ae3b29
|
* fix bug.
|
2022-03-24 16:40:28 +08:00 |
|
|
王怡栋
|
e504d28044
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21088,#21077
See merge request easycorp/zentaopms!2507
|
2022-03-24 08:39:06 +00:00 |
|
|
Zongjun Lan
|
a37d937d63
|
* fix bug #21077
|
2022-03-24 16:35:51 +08:00 |
|
|
tianshujie
|
b62c165dee
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-24 16:02:43 +08:00 |
|
|
tianshujie
|
9f3f0bd8c6
|
* Fix bug #20858.
|
2022-03-24 16:01:18 +08:00 |
|
|
李玉春
|
a71c0beef4
|
Merge branch 'sprint/fixbug_zhouxudong' into 'sprint/165_package'
* Fix bug #21117.
See merge request easycorp/zentaopms!2514
|
2022-03-24 07:43:42 +00:00 |
|
|
zhouxudong
|
c76b1054d8
|
* Fix bug #21117.
|
2022-03-24 15:18:18 +08:00 |
|
|
王怡栋
|
642339d8e0
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-24 14:57:03 +08:00 |
|
|
王怡栋
|
7d3fa9fbab
|
* code for task #51509.
|
2022-03-24 14:56:40 +08:00 |
|
|
tianshujie
|
ffcff9430c
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-24 14:56:14 +08:00 |
|
|
tianshujie
|
a5db3ca766
|
* optimize UI for kanban and fix drop rules not work.
|
2022-03-24 14:54:11 +08:00 |
|
|
李玉春
|
d38471abfc
|
Merge branch 'sprint/fixbug_zhouxudong' into 'sprint/165_package'
* Fix bug #21117.
See merge request easycorp/zentaopms!2512
|
2022-03-24 06:47:51 +00:00 |
|
|
zhouxudong
|
5aade964d5
|
* Fix bug #21117.
|
2022-03-24 14:44:30 +08:00 |
|
|
Zongjun Lan
|
e3fe57931f
|
* fix bug #21088
|
2022-03-24 14:21:29 +08:00 |
|
|
hufangzhou
|
6726a3d816
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_package
|
2022-03-24 13:23:12 +08:00 |
|
|
hufangzhou
|
ec827b7ed0
|
* Give config 777 permission.
|
2022-03-24 13:23:03 +08:00 |
|
|
王怡栋
|
7bc4187c55
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21084,#21078
See merge request easycorp/zentaopms!2501
|
2022-03-24 04:17:59 +00:00 |
|
|
Zongjun Lan
|
53d6d33f5b
|
* fix bug #21084
|
2022-03-24 11:11:34 +08:00 |
|
|
Zongjun Lan
|
30a9ffc5ed
|
* fix bug #21078
|
2022-03-24 11:11:12 +08:00 |
|
|
hufangzhou
|
11e151a6fa
|
* Add the new version.
|
2022-03-24 10:48:05 +08: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 |
|
|
王怡栋
|
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 |
|