王怡栋
|
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 |
|
朱金勇
|
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 |
|
李玉春
|
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 |
|
孙广明
|
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 |
|
zhouxin
|
78263786ed
|
Move getError from controller to model.
|
2022-03-17 07:50:54 +00:00 |
|
zhouxudong
|
6b09aac4aa
|
* Fix bug #20832.
|
2022-03-17 14:20:33 +08: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 |
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
tianshujie
|
ccb9dfdf07
|
* Fix bug #17960.
|
2022-03-14 10:04:23 +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
|
b51e39e69f
|
* fix bug #20640
|
2022-03-11 14:58:39 +08:00 |
|
songchenxuan
|
c309388a68
|
*Kanban view data.
|
2022-03-08 15:40:05 +08:00 |
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +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 |
|
孙华伟
|
e7d721af85
|
*
|
2022-03-02 13:15:04 +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 |
|
xieqiyu
|
e3b101a807
|
* Fix bug of foreach.
|
2022-03-02 09:36:54 +08:00 |
|
孙广明
|
5decf2cf6c
|
Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.
See merge request easycorp/zentaopms!1991
|
2022-03-02 00:31:17 +00:00 |
|
xieqiyu
|
06af0ff6c4
|
* Code for task#49696.
|
2022-03-01 17:28:57 +08:00 |
|
孙华伟
|
23511a0472
|
*Story #30528.
|
2022-03-01 15:37:05 +08:00 |
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
孙华伟
|
5b99190d32
|
*
|
2022-03-01 14:53:57 +08:00 |
|
孙华伟
|
b116054287
|
*
|
2022-03-01 14:07:45 +08:00 |
|
zhangzilong
|
868a293324
|
*
|
2022-03-01 10:05:30 +08:00 |
|
xieqiyu
|
af76bc5b46
|
* Append story module when change product type.
|
2022-02-28 17:50:06 +08:00 |
|
孙华伟
|
271e52a98c
|
*
|
2022-02-28 15:46:06 +08:00 |
|
zhangzilong
|
b4176af440
|
* Finish task #49297.
|
2022-02-28 15:31:43 +08:00 |
|
孙华伟
|
0ea4f15d4b
|
*
|
2022-02-28 14:36:44 +08:00 |
|
zhangzilong
|
e30a8b1343
|
* Finish task #49297.
|
2022-02-28 14:27:55 +08:00 |
|
xieqiyu
|
5f6c2bec3b
|
* Delete unused code.
|
2022-02-28 10:44:41 +08:00 |
|
zhouxudong
|
0e15ad41b6
|
* Finish task #49696.
|
2022-02-25 16:17:40 +08:00 |
|
孙广明
|
8f89f4d64f
|
Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529
See merge request easycorp/zentaopms!1958
|
2022-02-25 05:45:27 +00:00 |
|
孙华伟
|
68ef9809dd
|
*
|
2022-02-25 13:37:32 +08:00 |
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
孙华伟
|
0067119fbe
|
*Fix bug #19959 #19963
|
2022-02-25 11:08:38 +08:00 |
|
孙华伟
|
47e2415b16
|
*Fix bug #19959 #19963 .
|
2022-02-25 11:06:20 +08:00 |
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
孙华伟
|
e7920e73b4
|
*
|
2022-02-25 08:38:25 +08:00 |
|
xieqiyu
|
7c65ee9555
|
* Fix bug.
|
2022-02-24 16:30:18 +08:00 |
|