Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
33,076 Commits 2 Branches 292 Tags
3b7737f2ffcccc5071da00aa115cd2b767d6fef4
Commit Graph
934 Commits
Author SHA1 Message Date
tanghucheng 1506fe5e4c * fix bug #19025. 2022-01-28 13:15:02 +08:00
zhujinyong 0790236032 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-27 16:57:19 +08:00
zhujinyong c251540cbe * Fix menu order. 2022-01-27 16:57:03 +08:00
tanghucheng 14d12d41fd *fix bug #19071. 2022-01-27 13:04:12 +08:00
zhujinyong a69e209afa * Fix link for lite. 2022-01-27 10:55:50 +08:00
Wenrui LI ca32fb848f * filter trash by vision, task #47935. 2022-01-25 14:18:56 +08:00
tanghucheng 0b41fc7fc6 * Fix bug #18851. 2022-01-24 09:59:01 +08:00
tanghucheng 565ade2d53 * adjust for dynamic. 2022-01-21 11:06:22 +08:00
朱金勇 5e285ba992 Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master' 
*Fix bug #13636.

See merge request easycorp/zentaopms!1384
 2022-01-18 05:06:01 +00:00
liumengyi a0921f1c7d * Fix bug #18638, #18644. 2022-01-18 10:49:53 +08:00
zhouxudong ac318de175 *Fix bug #13636. 2022-01-17 13:12:02 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
王怡栋 dda972beee * adjust for get trashes. 2022-01-14 09:50:09 +08:00
zhouxudong a73e08d4cb *Fix bug #13636. 2022-01-14 08:46:14 +08:00
liumengyi 92c3693650 * Fix bug #18419, #18414, #18411. 2022-01-13 17:20:21 +08:00
zhouxudong 6eed68f446 *Fix bug #13636. 2022-01-13 15:17:54 +08:00
liumengyi 0aba204fbf * Fix bug for kanban execution. 2022-01-13 11:58:28 +08:00
tianshujie 8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
songchenxuan bb13431274 *Fix bug 18074. 2022-01-11 08:34:55 +08:00
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