Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
32,558 Commits 2 Branches 292 Tags
8b22fdcabcda8344130c8edcae7eb8c5fbd0e00d
Commit Graph
32558 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie 8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明 5d2cfa4c1e Merge branch 'sprint/182_tianshujie_47336' into kanban 2022-01-12 15:53:32 +08:00
孙广明 5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336' 
# Conflicts:
#   module/execution/control.php
 2022-01-12 07:53:04 +00:00
tianshujie c5bf8afbc2 * Modify the link judgment method. 2022-01-12 15:50:44 +08:00
孙广明 dad8b2f970 Merge branch 'sprint/182_liumengyi_kanban' into kanban 2022-01-12 15:45:35 +08:00
孙广明 ddc5b0cf1d Merge branch 'kanban' into 'sprint/182_liumengyi_kanban' 
# Conflicts:
#   module/kanban/model.php
 2022-01-12 07:45:15 +00:00
tianshujie 4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00
liumengyi 0b334a246f * Add column menu. 2022-01-12 15:39:33 +08:00
李玉春 cfc6e37281 Merge branch 'sgm_refactor' into 'kanban' 
* Refactor kanban code.

See merge request easycorp/zentaopms!1357
 2022-01-12 03:33:08 +00:00
孙广明 aa0faea270 * Adjust code. 2022-01-12 11:32:25 +08:00
孙广明 0afb843ef5 * Refactor kanban code. 2022-01-12 11:23:05 +08:00
tianshujie 7870309514 * Modify create and execute jump app error. 2022-01-12 11:13:16 +08:00
tianshujie a0d61f9d2f * Working with Kanban Data. 2022-01-12 11:07:02 +08:00
tianshujie e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +08:00
孙广明 2ed55b0c68 Merge branch 'sprint/182_liumengyi_47334' into 'kanban' 
* Finish task #47334.Add default view of professional RD Kanban.

See merge request easycorp/zentaopms!1354
 2022-01-12 02:21:19 +00:00
liumengyi ac91316068 * Modify code format of kanban model. 2022-01-12 10:17:35 +08:00
liumengyi adf53d8754 * Finish task #47334.Add default view of professional RD Kanban. 2022-01-12 10:08:15 +08:00
孙广明 cc68da4d37 Merge branch 'sprint/182_tianshujie_47358' into 'kanban' 
* Finish task #47358.

See merge request easycorp/zentaopms!1350
 2022-01-12 01:09:59 +00:00
tianshujie 8206d239cc * Recalculate area height. 2022-01-12 09:08:56 +08:00
tianshujie 6b4c03f5a4 * Add sql statement. 2022-01-12 08:35:17 +08:00
tianshujie 89dc868c3c * Modify the code. 2022-01-12 08:19:34 +08:00
tianshujie d20ba7265b * Modify the code logic. 2022-01-11 21:23:16 +08:00
tianshujie cf829b4731 * Add new icons: "size-height" and "inherit-space". 2022-01-11 17:14:27 +08:00
tianshujie 9faee43d47 * Modify default value. 2022-01-11 17:07:40 +08:00
tianshujie aca23db346 * Finish task #47358. 2022-01-11 17:02:17 +08:00
王怡栋 48e9171569 Merge branch 'sgm_kanban' into 'kanban' 
* Refactor kanban.

See merge request easycorp/zentaopms!1349
 2022-01-11 08:20:29 +00:00
孙广明 b3681c395a * Refactor kanban. 2022-01-11 16:18:07 +08:00
孙广明 62b7f5eac1 Merge branch 'sprint/182_liumengyi_47340' into 'kanban' 
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
 2022-01-11 07:53:14 +00:00
liumengyi ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
李玉春 8cf613ac6b Merge branch 'sgm_kanbanmodel' into 'kanban' 
Add kanban to execution.

See merge request easycorp/zentaopms!1339
 2022-01-11 06:14:15 +00:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明 95e9f324ee Merge branch 'sprint/182_liumengyi_47340' into 'kanban' 
* Finish task #47340, #47341.

See merge request easycorp/zentaopms!1337
 2022-01-11 02:19:00 +00:00
liumengyi 759841b3a5 * Fix bug for create execution. 2022-01-11 10:16:13 +08:00
liumengyi 203b97de5f * Finish task #47340. 2022-01-11 10:14:49 +08:00
liumengyi ddb8a4037d * Finish task #47340, #47341. 2022-01-11 10:11:59 +08:00
王怡栋 9f778e38b5 Merge branch 'revert-3e9bcdb8' into 'master' 
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"

See merge request easycorp/zentaopms!1328
 2022-01-11 00:43:35 +00:00
王怡栋 19fc483611 Merge branch 'revert-b904bc3c' into 'master' 
Revert "Merge branch 'sgm_182db' into 'master'"

See merge request easycorp/zentaopms!1329
 2022-01-11 00:41:01 +00:00
王怡栋 1e50b1b3e4 Merge branch 'revert-db968165' into 'master' 
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"

See merge request easycorp/zentaopms!1331
 2022-01-11 00:40:34 +00:00
孙广明 1cae18380b Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'" 
This reverts merge request !1324
 2022-01-11 00:39:37 +00:00
孙广明 9a744f651a Revert "Merge branch 'sgm_182db' into 'master'" 
This reverts merge request !1325
 2022-01-11 00:38:36 +00:00
孙广明 3ab13aa61e Merge branch 'sprint/182_songchenxuan_action_lang' into 'master' 
*Case action lang.

See merge request easycorp/zentaopms!1322
 2022-01-11 00:36:32 +00:00
孙广明 b57562e99e Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" 
This reverts merge request !1326
 2022-01-11 00:35:04 +00:00
songchenxuan bb13431274 *Fix bug 18074. 2022-01-11 08:34:55 +08:00
李玉春 b904bc3c58 Merge branch 'sgm_182db' into 'master' 
* Add upgrade.sql.

See merge request easycorp/zentaopms!1325
 2022-01-11 00:11:48 +00:00
zhujinyong 80765f894d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-01-10 21:13:52 +08:00
zhujinyong f3e681c99f * Add testTask table for update0.sql. 2022-01-10 21:12:04 +08:00
孙广明 714471e03b Merge branch 'sprint/182_liumengyi_47483' into 'master' 
* Finish task #47483.

See merge request easycorp/zentaopms!1327
 2022-01-10 09:40:44 +00:00
liumengyi cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
孙广明 3e9bcdb892 Merge branch 'sprint/182_hufangzhou_47331' into 'master' 
* Finish task #47331.

See merge request easycorp/zentaopms!1326
 2022-01-10 09:21:23 +00:00
hufangzhou 0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00