 孙华伟
|
4ac1b90743
|
Update model.php
|
2022-03-09 00:59:31 +00:00 |
|
|
孙华伟
|
8f3dc47e67
|
Update kanban control.php
|
2022-03-09 00:55:06 +00:00 |
|
|
孙华伟
|
31df5afed4
|
* add permissions.
|
2022-03-08 15:22:46 +08:00 |
|
|
孙华伟
|
98311aca91
|
*
|
2022-03-08 14:54:10 +08:00 |
|
|
孙华伟
|
c7f5c1f255
|
*
|
2022-03-08 14:43:41 +08:00 |
|
|
孙华伟
|
67a0272d96
|
*Story #31107.
|
2022-03-08 14:41:51 +08:00 |
|
|
孙华伟
|
03e3f26ad5
|
*
|
2022-03-08 10:03:06 +08:00 |
|
|
孙华伟
|
f8eacb6726
|
*Story #31107.
|
2022-03-08 09:48:18 +08:00 |
|
|
孙华伟
|
d8bb8a903e
|
*
|
2022-03-04 14:34:01 +08:00 |
|
|
李玉春
|
c2ca38aa83
|
Merge branch 'pailei_zhouxin_20276' into 'pailei'
Add kindeditor for the view and close page of productplan.
See merge request easycorp/zentaopms!2056
|
2022-03-03 04:02:01 +00:00 |
|
|
李玉春
|
5fce5da22d
|
Merge branch 'pailei_sunhuawei_bug20273' into 'pailei'
Pailei sunhuawei bug20273
See merge request easycorp/zentaopms!2055
|
2022-03-03 02:44:52 +00:00 |
|
|
zhouxin
|
27d109e904
|
Add kindeditor for the view and close page of productplan.
|
2022-03-03 02:22:51 +00: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 |
|
|
孙广明
|
3ba03730b9
|
Merge branch 'pailei_xieqiyu_20257' into 'pailei'
* Fix bug#20257.
See merge request easycorp/zentaopms!2051
|
2022-03-02 09:23:05 +00:00 |
|
|
xieqiyu
|
05fdbfd0d3
|
* Fix bug#20257.
|
2022-03-02 16:49:23 +08:00 |
|
|
孙广明
|
4f5455a114
|
Merge branch 'pailei_xieqiyu_20268' into 'pailei'
* Fix bug#20268.
See merge request easycorp/zentaopms!2050
|
2022-03-02 07:28:09 +00:00 |
|
|
xieqiyu
|
e30e3f81d3
|
* Fix bug#20268.
|
2022-03-02 15:25:33 +08:00 |
|
|
李玉春
|
a0a2e7e95b
|
Merge branch 'pailei_mayue_task49293' into 'pailei'
* Finish task#49293.
See merge request easycorp/zentaopms!2046
|
2022-03-02 06:05:52 +00:00 |
|
|
孙广明
|
25d240ebca
|
Merge branch 'sprint/pailei_zhouxin_20192' into 'pailei'
Fix bug.
See merge request easycorp/zentaopms!2042
|
2022-03-02 05:53:07 +00:00 |
|
|
孙广明
|
33170c12f6
|
Merge branch 'sprint/pailei_zhouxin_20191' into 'pailei'
Fix bug #20191.
See merge request easycorp/zentaopms!2045
|
2022-03-02 05:52:20 +00:00 |
|
|
zhouxin
|
087916a60e
|
Fix bug #20191.
|
2022-03-02 05:49:21 +00:00 |
|
|
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 |
|
|
zhouxin
|
8722ab62f1
|
Fix bug.
|
2022-03-02 03:28:09 +00: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 |
|
|
mayue
|
852020b924
|
* Finish task#49293.
|
2022-03-02 10:39:38 +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 |
|