liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
孙广明
|
c44da998c0
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2393
|
2022-03-21 06:30:44 +00:00 |
|
liumengyi
|
441200128a
|
* Add auto test of bug.
|
2022-03-21 14:29:19 +08:00 |
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
liyuchun
|
8efe478798
|
* Fix bug #19231,19230.
|
2022-03-21 10:15:36 +08:00 |
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
tianshujie
|
56c5c966ea
|
* Modify the problem that the execution label cannot be fully displayed.
|
2022-03-14 08:55:39 +08:00 |
|
Zongjun Lan
|
9b8f238779
|
* code format
|
2022-03-11 17:31:31 +08:00 |
|
Zongjun Lan
|
22c49a0949
|
* fix bug #20647
|
2022-03-11 16:29:00 +08:00 |
|
Zongjun Lan
|
af893de5d8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-03-11 15:06:54 +08:00 |
|
Zongjun Lan
|
b51e39e69f
|
* fix bug #20640
|
2022-03-11 14:58:39 +08:00 |
|
tianshujie
|
7e89329205
|
* Fix bug #20546.
|
2022-03-10 15:09:54 +08:00 |
|
tianshujie
|
a7d66c5fae
|
* Fix bug #20572.
|
2022-03-10 10:05:34 +08:00 |
|
tianshujie
|
b4c0fff8e0
|
* Fix bug #20531.
|
2022-03-09 14:55:04 +08:00 |
|
tianshujie
|
a349c5bfeb
|
* Fix bug #20530.
|
2022-03-09 14:01:41 +08:00 |
|
王怡栋
|
fb22e1dcb0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368
See merge request easycorp/zentaopms!2128
|
2022-03-08 07:54:22 +00:00 |
|
songchenxuan
|
c309388a68
|
*Kanban view data.
|
2022-03-08 15:40:05 +08:00 |
|
tianshujie
|
54ac0f8c8e
|
* Finish task #50380.
|
2022-03-08 13:52:34 +08:00 |
|
Zongjun Lan
|
b82a7e5f57
|
* fix bug 50368
|
2022-03-08 09:51:34 +08:00 |
|
王怡栋
|
eaba6dcc3c
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20329,20350,20366.
See merge request easycorp/zentaopms!2123
|
2022-03-07 09:09:58 +00:00 |
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|
王怡栋
|
b2aa0be020
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496
See merge request easycorp/zentaopms!2112
|
2022-03-07 07:41:30 +00:00 |
|
Zongjun Lan
|
7add528024
|
* fix bug 19496
|
2022-03-07 15:37:27 +08:00 |
|
孙广明
|
23ebec3d25
|
Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.
See merge request easycorp/zentaopms!2109
|
2022-03-07 05:19:08 +00:00 |
|
孙广明
|
1b137f7bc8
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2107
|
2022-03-07 05:13:55 +00:00 |
|
xieqiyu
|
b455987346
|
* Fix bug.
|
2022-03-07 13:02:17 +08:00 |
|
liumengyi
|
15a95e6c6b
|
* Finish task #50324.
|
2022-03-07 11:05:46 +08:00 |
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
tianshujie
|
afed9c5c71
|
* Finish task #50338.
|
2022-03-07 10:37:41 +08:00 |
|
tianshujie
|
5b2b646db3
|
* Fix bug #20328.
|
2022-03-04 16:29:56 +08:00 |
|
孙广明
|
af52c74832
|
Merge branch 'sprint/186_liumengyi_20293' into 'master'
* Fix bug #20290.
See merge request easycorp/zentaopms!2058
|
2022-03-03 06:55:22 +00:00 |
|
liumengyi
|
86d19f82f7
|
* Fix bug #20290.
|
2022-03-03 14:53:58 +08:00 |
|
Zongjun Lan
|
0512526c23
|
* fix bug 19713
|
2022-03-03 10:07:55 +08:00 |
|
孙华伟
|
c01323fdbb
|
*Fix bug #20273 .
|
2022-03-03 09:40:43 +08:00 |
|
孙华伟
|
e0640737c2
|
*Fix bug #20273.
|
2022-03-03 09:34:41 +08:00 |
|
李玉春
|
a0da36e3f2
|
Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
# module/execution/control.php
# module/execution/view/kanban.html.php
|
2022-03-02 05:34:15 +00:00 |
|
孙华伟
|
8623e8553e
|
:Merge branch 'pailei_sunhuawei_story_30528' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei_sunhuawei_story_30528
|
2022-03-02 13:16:58 +08:00 |
|
孙华伟
|
e7d721af85
|
*
|
2022-03-02 13:15:04 +08:00 |
|
李玉春
|
aeaf877933
|
Update kanban.js
|
2022-03-02 05:11:04 +00:00 |
|
孙华伟
|
03b0221c99
|
*
|
2022-03-02 13:08:22 +08:00 |
|
孙华伟
|
fa34d9e024
|
*
|
2022-03-02 11:31:50 +08:00 |
|
孙华伟
|
51b7e615e0
|
*
|
2022-03-02 11:30:20 +08:00 |
|
孙华伟
|
5d61f31c3b
|
*
|
2022-03-02 11:22:23 +08:00 |
|
孙华伟
|
abd00b8f08
|
*
|
2022-03-02 11:13:22 +08:00 |
|
孙华伟
|
33a2aec741
|
*
|
2022-03-02 11:00:51 +08:00 |
|
孙广明
|
b63fa55607
|
Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.
See merge request easycorp/zentaopms!2029
|
2022-03-02 03:00:45 +00:00 |
|
孙华伟
|
0402049b85
|
*
|
2022-03-02 10:58:08 +08:00 |
|
zhangzilong
|
92f4d32a68
|
* Finish task #49297.
|
2022-03-02 10:57:48 +08:00 |
|
孙华伟
|
f4bed0d0c6
|
*
|
2022-03-02 10:28:01 +08:00 |
|
孙华伟
|
a282e6c0e6
|
*Story #30528.
|
2022-03-02 09:56:58 +08:00 |
|