Commit Graph

63 Commits

Author SHA1 Message Date
孙广明
197a1bceea * Finish task #46165. 2021-12-22 09:41:39 +08:00
孙广明
87c12c800a * Fix code details. 2021-12-17 15:43:19 +08:00
孙广明
9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
Hao Sun
5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00
Hao Sun
9d7449acae * refactor. 2021-12-01 08:29:07 +08:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
liyuchun
4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
李玉春
60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.

See merge request easycorp/zentaopms!359
2021-11-09 06:36:52 +00:00
孙广明
954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun
f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
孙广明
1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
李玉春
f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.

See merge request easycorp/zentaopms!281
2021-11-02 06:13:46 +00:00
孙广明
90b6253107 * Fix var name. 2021-11-02 14:12:18 +08:00
李玉春
86c7464aca Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.

See merge request easycorp/zentaopms!282
2021-11-02 06:09:04 +00:00
孙广明
cc321393f6 * Change var name. 2021-11-02 14:05:53 +08:00
孙广明
3a61d3e8a6 Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15852.

See merge request easycorp/zentaopms!275
2021-11-02 06:04:03 +00:00
孙广明
c7f0e74517 * Assign btn check priv. 2021-11-02 13:59:41 +08:00
liyuchun
03d1e570fc * Fix bug #15844. 2021-11-02 09:58:20 +08:00
孙广明
f7ce0adcd0 Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15901.

See merge request easycorp/zentaopms!270
2021-11-02 01:05:03 +00:00
李玉春
cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.

See merge request easycorp/zentaopms!269
2021-11-02 00:34:38 +00:00
liyuchun
a925bd1d90 * Fix bug #15901. 2021-11-01 17:40:36 +08:00
tianshujie
5444d35cde * Fix bug #15902. 2021-11-01 17:34:25 +08:00
孙广明
1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
2021-11-01 09:18:16 +00:00
liyuchun
1631791368 * Fix bug #15887,#15877. 2021-11-01 16:54:02 +08:00
孙广明
065b0d04c9 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15867.

See merge request easycorp/zentaopms!260
2021-11-01 08:30:11 +00:00
liyuchun
d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
李玉春
16b6f5786e Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423'
# Conflicts:
#   module/execution/js/kanban.js
#   module/kanban/model.php
2021-11-01 08:12:58 +00:00
孙广明
2b2ec6f202 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15861.

See merge request easycorp/zentaopms!252
2021-11-01 08:02:42 +00:00
hufangzhou
f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
孙广明
4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
2021-11-01 05:53:00 +00:00
hufangzhou
702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
liyuchun
7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
dingna
c28e4c1b61 * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-11-01 13:26:57 +08:00
xieqiyu
c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
liyuchun
970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
xieqiyu
d5914e8ffc * Conflict resolution. 2021-10-29 14:12:07 +08:00
李玉春
8ce1a694fc Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
2021-10-29 05:50:12 +00:00
dingna
6369e0f7a3 * Fix an error. 2021-10-29 13:37:03 +08:00
liyuchun
4f56cc8c0f * Finish task #43407,#43406. 2021-10-29 12:37:59 +08:00
dingna
0fac3aa189 * Adjust Code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-10-29 11:33:47 +08:00
夏文龙
a0a4af4daa Update kanban.html.php 2021-10-29 02:33:45 +00:00
xiawenlong
f74435a42d fix code style 2021-10-29 10:26:34 +08:00
xiawenlong
5397954f15 Finish permissionOC 2021-10-29 10:13:39 +08:00
xiawenlong
3dc8358434 Finish permissionOC 2021-10-29 10:09:07 +08:00
dingna
0b13f86812 * Code update for task * 43401,#43507,#43398. 2021-10-29 09:23:53 +08:00
xieqiyu
04b34ce724 * Adjust code style. 2021-10-29 08:56:58 +08:00
dingna
87c6365aee * Code for task#43401,#43507,#43398. 2021-10-29 08:43:06 +08:00
liyuchun
817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
孙广明
83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
孙广明
b6cc57c54e Merge branch 'spirnt/168_liyuchun_43409' into 'sprint/168'
* Finish task #43521.

See merge request easycorp/zentaopms!193
2021-10-27 09:27:49 +00:00