liyuchun
|
07622ec7af
|
* Fix bug #18151.
|
2022-03-24 16:21:06 +08:00 |
|
liyuchun
|
57d6407fba
|
* Fix bug #13732.
|
2022-03-24 10:51:43 +08:00 |
|
李玉春
|
939d7664ff
|
Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* fix issue for drag-and-drop cards in kanban.
See merge request easycorp/zentaopms!2497
|
2022-03-24 02:41:19 +00:00 |
|
李玉春
|
c458dab32a
|
Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072
See merge request easycorp/zentaopms!2496
|
2022-03-24 02:40:57 +00:00 |
|
tianshujie
|
9178a6e3b3
|
* Modify variable name.
|
2022-03-24 10:27:42 +08:00 |
|
Hao Sun
|
fcbafd57f0
|
* fix issue for drag-and-drop cards in kanban.
|
2022-03-24 09:46:24 +08:00 |
|
tianshujie
|
9b7d8686c7
|
* Modify the judgment logic.
|
2022-03-24 09:42:08 +08:00 |
|
孙广明
|
42f7f22cd0
|
Merge branch 'autotest_ly' into 'master'
add build and update story
See merge request easycorp/zentaopms!2495
|
2022-03-24 01:36:24 +00:00 |
|
tianshujie
|
e9ee8a176d
|
* Fix bug #19072.
|
2022-03-24 09:35:39 +08:00 |
|
liyang
|
9b9a528023
|
add build and update story
|
2022-03-24 09:34:43 +08:00 |
|
孙广明
|
3bfa2b8e0d
|
Merge branch 'sprint/autoTest_liumengyi_todo' into 'master'
* Add auto test of todo.
See merge request easycorp/zentaopms!2494
|
2022-03-24 01:20:23 +00:00 |
|
liumengyi
|
a14b6e50b5
|
* Add auto test of todo.
|
2022-03-24 09:18:05 +08:00 |
|
李玉春
|
bd6bf93aaa
|
Merge branch 'cyy_bug' into 'master'
* Modify config get.
See merge request easycorp/zentaopms!2492
|
2022-03-24 01:03:35 +00:00 |
|
caoyanyi
|
258e8040c5
|
* Adjust code.
|
2022-03-24 09:03:37 +08:00 |
|
caoyanyi
|
e2ba478233
|
* Modify config get.
|
2022-03-24 09:02:00 +08:00 |
|
tianshujie
|
bd9b982157
|
* Fix the problem that the kanban cannot be displayed in the IE browser.
|
2022-03-24 08:39:15 +08:00 |
|
李玉春
|
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 |
|
王怡栋
|
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 |
|
caoyanyi
|
b7b3a26e33
|
* Add app language.
|
2022-03-23 16:26:51 +08: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 |
|
caoyanyi
|
63ab9c8de3
|
* Add config return.
|
2022-03-23 16:20:21 +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 |
|
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 |
|
xieqiyu
|
e52f5c78b7
|
* Fix bug#21037.
|
2022-03-23 14:57:59 +08:00 |
|