王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
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 |
|
zhouxin
|
22b377a5aa
|
Fix bug #19382.
|
2022-03-21 05:48:13 +00:00 |
|
liyuchun
|
8efe478798
|
* Fix bug #19231,19230.
|
2022-03-21 10:15:36 +08:00 |
|
李玉春
|
c361f267b3
|
Merge branch 'sprint/pailei2_zhouxudong_10978' into 'pailei2'
* Fix bug #10978.
See merge request easycorp/zentaopms!2382
|
2022-03-21 00:50:45 +00:00 |
|
zhouxudong
|
24963355c1
|
* Fix bug #10978.
|
2022-03-19 15:06:54 +08:00 |
|
zhouxudong
|
b239f405f8
|
* Fix bug #10978.
|
2022-03-18 17:22:48 +08:00 |
|
李玉春
|
f935639cb8
|
Merge branch 'pailei2_zhouxin_fixbugs' into 'pailei2'
Pailei2 zhouxin fixbugs
See merge request easycorp/zentaopms!2375
|
2022-03-18 09:11:32 +00:00 |
|
zhouxin
|
6dc51aafc0
|
Adjust code.
|
2022-03-18 09:08:48 +00:00 |
|
朱金勇
|
c3cf329773
|
Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'
Sprint/pailei2 tianshujie fixbug
See merge request easycorp/zentaopms!2367
|
2022-03-18 05:40:59 +00:00 |
|
孙广明
|
d9505fa9fa
|
Merge branch 'pailei2_zhouxin_50796' into 'pailei2'
Pailei2 zhouxin 50796
See merge request easycorp/zentaopms!2341
|
2022-03-18 03:25:54 +00:00 |
|
zhouxin
|
f280e32777
|
Fix bug #17415.
|
2022-03-18 02:43:14 +00:00 |
|
tianshujie
|
5763c06094
|
* Fix bug #20914.
|
2022-03-17 20:37:53 +08:00 |
|
zhouxudong
|
c011895995
|
* Fix bug #20121.
|
2022-03-17 16:34:32 +08:00 |
|
zhouxin
|
a0956b72d5
|
Adjust code.
|
2022-03-17 08:31:48 +00:00 |
|
zhouxin
|
332847783c
|
Adjust code.
|
2022-03-17 08:29:16 +00:00 |
|
zhouxin
|
f0c4327371
|
Adjust code.
|
2022-03-17 08:22:09 +00:00 |
|
zhouxin
|
78263786ed
|
Move getError from controller to model.
|
2022-03-17 07:50:54 +00:00 |
|
zhouxin
|
b705f22460
|
Adjust lang.
|
2022-03-17 07:05:36 +00:00 |
|
zhouxin
|
95312f6b7b
|
Adjust lang.
|
2022-03-17 07:04:24 +00:00 |
|
zhouxin
|
9062870343
|
Fix bug #18766.
|
2022-03-17 06:48:33 +00:00 |
|
李玉春
|
72b050e02e
|
Merge branch 'sprint/pailei2_zhouxudong_20832' into 'pailei2'
* Fix bug #20832.
See merge request easycorp/zentaopms!2339
|
2022-03-17 06:25:33 +00:00 |
|
zhouxudong
|
6b09aac4aa
|
* Fix bug #20832.
|
2022-03-17 14:20:33 +08:00 |
|
孙广明
|
0542a65ed0
|
Merge branch 'pailei_sj_50765' into 'pailei2'
fixbug #19324
See merge request easycorp/zentaopms!2336
|
2022-03-17 06:02:46 +00:00 |
|
zhouxin
|
109d4049e0
|
Add errorBegin and errorEnd for batchUpdate of stage.
|
2022-03-17 06:00:58 +00:00 |
|
xieqiyu
|
00a8efaf80
|
* Fix bug#18756.
|
2022-03-17 13:37:20 +08:00 |
|
sunjun
|
ab9a3bfc0a
|
fixbug #19324
|
2022-03-17 13:33:15 +08:00 |
|
李玉春
|
0e26c165c2
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407
See merge request easycorp/zentaopms!2319
|
2022-03-17 01:31:38 +00:00 |
|
孙华伟
|
9270dbf6fa
|
*Fix bug #17639
|
2022-03-17 08:45:04 +08:00 |
|
zhouxin
|
cc9fad8baa
|
Fix bug #18766.
|
2022-03-16 08:41:31 +00:00 |
|
tianshujie
|
74548de746
|
* Fix the problem of no Kanban after Kanban execution creation.
|
2022-03-16 12:54:13 +08:00 |
|
tianshujie
|
bc03600b03
|
* Fix bug #19289.
|
2022-03-16 10:50:08 +08:00 |
|
李玉春
|
46222a0d13
|
Merge branch 'sprint/pailei2_zhouxudong23_50762' into 'pailei2'
Sprint/pailei2 zhouxudong23 50762
See merge request easycorp/zentaopms!2282
|
2022-03-16 00:46:23 +00:00 |
|
tianshujie
|
63f53d23d6
|
* Fix bug #19321.
|
2022-03-15 17:04:56 +08:00 |
|
zhouxudong
|
1847194fe7
|
* Finish task #50762.
|
2022-03-15 16:12:37 +08:00 |
|
孙广明
|
1f6c6363ba
|
Merge branch 'pailei2_sj_50765' into 'pailei2'
fixbug #19324
See merge request easycorp/zentaopms!2268
|
2022-03-15 06:02:50 +00:00 |
|
李玉春
|
59ff30de9d
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407
See merge request easycorp/zentaopms!2265
|
2022-03-15 05:43:03 +00:00 |
|
孙华伟
|
dd727476ad
|
* Fix bug #17639.
|
2022-03-15 13:36:52 +08:00 |
|
李玉春
|
93d656dc0b
|
Merge branch 'sprint/pailei2_zhouxudong_19967' into 'pailei2'
Sprint/pailei2 zhouxudong 19967
See merge request easycorp/zentaopms!2247
|
2022-03-15 05:28:44 +00:00 |
|
sunjun
|
316b989ffc
|
fixbug #19324
|
2022-03-15 13:24:06 +08:00 |
|
zhouxudong
|
2cef18b917
|
* Finish task #50762 #50763.
|
2022-03-15 10:26:27 +08:00 |
|
zhouxudong
|
fa85f99e59
|
* Fix bug #19967.
|
2022-03-14 17:05:18 +08:00 |
|
zhouxudong
|
2e4bb9c6ba
|
* Fix bug #19967.
|
2022-03-14 16:37:13 +08:00 |
|
xieqiyu
|
96fc77e620
|
* Fix bug#17363.
|
2022-03-14 16:36:30 +08:00 |
|
孙广明
|
ff3d2c46e2
|
Merge branch 'sprint/pailei2_tianshujie_50402' into 'pailei2'
Sprint/pailei2 tianshujie 50402
See merge request easycorp/zentaopms!2239
|
2022-03-14 08:12:46 +00:00 |
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
孙广明
|
afb4010223
|
Merge branch 'pailei_sj_50431' into 'pailei2'
fix bug #50431
See merge request easycorp/zentaopms!2214
|
2022-03-14 06:20:37 +00:00 |
|