 liyuchun
|
b002bc64ba
|
Merge branch 'pailei_sunhuawei_story_30528' into pailei
|
2022-03-02 13:36:55 +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 |
|
|
孙华伟
|
b534aeb89d
|
*
|
2022-03-02 11:26:02 +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 |
|
|
孙华伟
|
b5bf40983a
|
*
|
2022-03-02 10:39:24 +08:00 |
|
|
孙华伟
|
f4bed0d0c6
|
*
|
2022-03-02 10:28:01 +08:00 |
|
|
zhangzilong
|
ccc4ce9298
|
* Code for bug #49297.
|
2022-03-02 10:10:47 +08:00 |
|
|
xieqiyu
|
996992936e
|
* Change branches for batch create bug in execution.
|
2022-03-02 10:00:08 +08:00 |
|
|
孙华伟
|
a282e6c0e6
|
*Story #30528.
|
2022-03-02 09:56:58 +08:00 |
|
|
xieqiyu
|
e3b101a807
|
* Fix bug of foreach.
|
2022-03-02 09:36:54 +08:00 |
|
|
zhangzilong
|
2f38d907ee
|
* Code for task #49297.
|
2022-03-02 09:07:15 +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
|
daefe27bf5
|
* Delete unused code.
|
2022-03-01 17:33:45 +08:00 |
|
|
xieqiyu
|
06af0ff6c4
|
* Code for task#49696.
|
2022-03-01 17:28:57 +08:00 |
|
|
孙广明
|
1f040804c0
|
Merge branch 'pailei_xieqiyu_fixbug' into 'pailei'
* Fix bug of batch edit test case.
See merge request easycorp/zentaopms!2030
|
2022-03-01 07:43:34 +00:00 |
|
|
李玉春
|
f9546ef5e7
|
Merge branch 'sprint/pailei_mayue_bug20175' into 'pailei'
* Optimize code.
See merge request easycorp/zentaopms!2028
|
2022-03-01 07:38:09 +00:00 |
|
|
孙华伟
|
23511a0472
|
*Story #30528.
|
2022-03-01 15:37:05 +08:00 |
|
|
xieqiyu
|
f937a6ac8f
|
* Fix bug of batch edit test case.
|
2022-03-01 15:22:07 +08:00 |
|
|
mayue
|
1d46d36aed
|
* Optimize code.
|
2022-03-01 15:09:11 +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 |
|
|
xieqiyu
|
d4211b3f56
|
* Fix bug.
|
2022-03-01 14:58:32 +08:00 |
|
|
zhangzilong
|
3b5ebbda16
|
* Finish task #49297.
|
2022-03-01 14:57:23 +08:00 |
|
|
孙华伟
|
5b99190d32
|
*
|
2022-03-01 14:53:57 +08:00 |
|
|
xieqiyu
|
74326a3331
|
* Optimize the code.
|
2022-03-01 14:40:00 +08:00 |
|
|
zhangzilong
|
d8178d01eb
|
* Finish task #49297.
|
2022-03-01 14:27:16 +08:00 |
|
|
李玉春
|
f84fbf19c9
|
Merge branch 'sprint/pailei_mayue_bug20175' into 'pailei'
* Fix bug#20175.
See merge request easycorp/zentaopms!2025
|
2022-03-01 06:23:03 +00:00 |
|
|
孙华伟
|
af06215820
|
*
|
2022-03-01 14:20:06 +08:00 |
|
|
mayue
|
8fe8034cf4
|
* Fix bug#20175.
|
2022-03-01 14:15:21 +08:00 |
|
|
孙华伟
|
b116054287
|
*
|
2022-03-01 14:07:45 +08:00 |
|
|
孙华伟
|
8b79ae9c09
|
*Story #30528
|
2022-03-01 14:00:40 +08:00 |
|
|
zhangzilong
|
aff8bf40ef
|
* Finish task #49297.
|
2022-03-01 11:19:01 +08:00 |
|
|
王怡栋
|
80ffe8f352
|
* adjust for check priv.
|
2022-03-01 11:01:39 +08:00 |
|
|
zhangzilong
|
9150e9903b
|
* Finish task #49297.
|
2022-03-01 11:00:08 +08:00 |
|
|
zhangzilong
|
1777586537
|
* Finish task #49297.
|
2022-03-01 10:59:25 +08:00 |
|
|
王怡栋
|
0e85a489c3
|
Merge branch 'pailei' of https://gitlab.zcorp.cc/easycorp/zentaopms into pailei
|
2022-03-01 10:29:15 +08:00 |
|
|
王怡栋
|
dad7a8236a
|
* adjust for task #49362.
|
2022-03-01 10:28:53 +08:00 |
|
|
孙华伟
|
87db779922
|
*
|
2022-03-01 10:27:19 +08:00 |
|
|
zhangzilong
|
83bf7d564a
|
* Finish task #49297.
|
2022-03-01 10:13:43 +08:00 |
|
|
zhangzilong
|
868a293324
|
*
|
2022-03-01 10:05:30 +08:00 |
|