Commit Graph
965 Commits
Author SHA1 Message Date
songchenxuan 721cdba3d3 *Case action lang. 2022-01-10 14:11:28 +08:00
songchenxuan 16670c5483 *Fix bug #18074. 2022-01-06 17:36:55 +08:00
songchenxuan 3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
tianshujie 411d284d43 * Fix bug #18095. 2022-01-06 14:19:05 +08:00
tianshujie 127b69d4c7 * Fix bug #18095. 2022-01-06 13:47:18 +08:00
xieqiyu f78a39f5a1 * Fix bug#18250. 2022-01-06 11:21:43 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu 77ba543cc8 * Modify the mutual test problem. 2022-01-04 10:08:14 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master'
Refactor

See merge request easycorp/zentaopms!1229
2021-12-31 04:25:42 +00:00
孙广明 ad25920cf0 * Refactor code. 2021-12-31 11:06:46 +08:00
liumengyi 3dd747f40a * Modify judgment for split chid plan. 2021-12-31 10:59:37 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liumengyi e0d72a4c25 * Refactoring code for update status. 2021-12-31 09:40:46 +08:00
liumengyi 53aa300744 * Add dynamic for parent plan status flow. 2021-12-30 11:25:57 +08:00
zenggang bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
xieqiyu 2b7249da7a * Code for task#46521. 2021-12-30 08:47:06 +08:00
liumengyi 36e9b91ba0 * Finish task #46660. 2021-12-28 15:11:27 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
tianshujie 2cda67d63e * Fix bug #17892,#17899. 2021-12-23 16:35:31 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
tianshujie a9c8d74b72 * Fix bug #17882. 2021-12-23 14:26:46 +08:00
孙广明 17aaa5588f Merge branch 'sprint/179_liumengyi_addView' into 'master'
* Add Kanban View.

See merge request easycorp/zentaopms!1090
2021-12-23 03:25:49 +00:00
liumengyi 259bfef9d9 * Add Kanban View. 2021-12-23 10:30:56 +08:00
孙广明 3ee3458a3b * Adjust kanban details. 2021-12-23 09:54:56 +08:00
孙广明 ded871aa6f Merge branch 'sprint/31_zhouxin_17711' into 'master'
Sprint/31 zhouxin 17711

See merge request easycorp/zentaopms!1066
2021-12-22 07:49:40 +00:00
zhouxin d0eb0e8662 Fix bug #17711. 2021-12-22 06:09:36 +00:00
孙广明 75a3d20358 Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
#   module/group/lang/resource.php
#   module/kanban/css/space.css
#   module/kanban/js/view.js
2021-12-22 06:03:21 +00:00
zhouxin 32bb53370c Fix bug #17711. 2021-12-22 06:01:35 +00:00
tianshujie dab44100d5 * Finish task #46241. 2021-12-22 13:16:32 +08:00
hufangzhou 5b0923a7a3 * Resolve the issue of merge branch. 2021-12-22 10:07:18 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
孙广明 3db6c1bf1e * Code for trashes. 2021-12-20 15:40:02 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
zhujinyong 72b41be5b0 - Remove die() of action module. 2021-12-20 09:05:16 +08:00
liumengyi 23bec4a9ed * Modify code format. 2021-12-20 08:43:34 +08:00
liumengyi 79c523399b * Modify kanban judgment in recycle bin. 2021-12-20 08:28:18 +08:00
liumengyi 7d3ad08bc6 * Finish task #46158, and fix bug #17657,#17655. 2021-12-17 15:39:41 +08:00
caoyanyi d9a5f136b1 * Add gitlab tag create function and page. 2021-12-16 05:13:43 +00:00
xieqiyu fde47bebb6 * Fix bug#17516. 2021-12-14 16:56:59 +08:00
tianshujie cc414d4e14 * Fix Kanban dynamic issue. 2021-12-13 17:45:42 +08:00
liyuchun 4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春 fbe7f981ab Merge branch 'sprint/devops16_17345' into 'sprint/devops16'
* Fix bug#17345

See merge request easycorp/zentaopms!890
2021-12-13 03:26:13 +00:00
zhujinyong ad8b03c73f * Refactoring of getDynamic. 2021-12-13 11:03:58 +08:00
王怡栋 49cd37e6de * code task #45436. 2021-12-10 14:38:08 +08:00
tianshujie 5d7a3c9215 * Add dynamic link. 2021-12-10 14:24:16 +08:00