Commit Graph
30932 Commits
Author SHA1 Message Date
tianshujie 6244b7500b * Modify the space variable name. 2021-12-10 10:16:48 +08:00
tianshujie 446f4a86ed * Modify the space variable name. 2021-12-10 10:14:06 +08:00
tianshujie fe254eafb0 * Modify card style. 2021-12-10 09:41:07 +08:00
tianshujie 0588ec9b61 * Finish task #45815. 2021-12-10 09:09:38 +08:00
孙广明 f35a970a5f Merge branch 'sprint/177_tianshujie_error' into 'kanban'
* Fix error.

See merge request easycorp/zentaopms!862
2021-12-09 08:01:35 +00:00
tianshujie c565b6a5d4 * Fix error. 2021-12-09 16:00:20 +08:00
孙广明 7a94a08436 Merge branch 'sprint/177_tianshujie_45815' into kanban 2021-12-09 15:58:19 +08:00
孙广明 16da4cdf28 Merge branch 'kanban' into 'sprint/177_tianshujie_45815'
# Conflicts:
#   module/kanban/control.php
#   module/kanban/model.php
2021-12-09 07:54:42 +00:00
tianshujie 30c95b0915 * Modify code variables. 2021-12-09 15:51:30 +08:00
tianshujie 09c3e93969 * Modify the logic of the query space. 2021-12-09 15:46:24 +08:00
孙广明 8d1e0491d6 Merge branch 'sprint/177_sunhao/new_icons' into 'kanban'
* add 6 new icons for kanban.

See merge request easycorp/zentaopms!860
2021-12-09 07:34:32 +00:00
tianshujie 362cd1189b * Modify variables. 2021-12-09 15:33:16 +08:00
tianshujie 023db164d0 * Adjust code of kanban model file. 2021-12-09 15:31:49 +08:00
Hao Sun 02df6e2704 * add 6 new icons for kanban.
The new icons includes: col-add-left, col-add-right, col-split, col-archive, card-archive, zone.
2021-12-09 15:23:53 +08:00
tianshujie a3e9d350eb * Finish task #45817. 2021-12-09 15:19:37 +08:00
孙广明 780cf3a79d Merge branch 'sprint/177_liumengyi_45823' into kanban 2021-12-09 14:42:37 +08:00
孙广明 f447e44833 Merge branch 'kanban' into 'sprint/177_liumengyi_45823'
# Conflicts:
#   module/kanban/control.php
2021-12-09 06:41:49 +00:00
liumengyi 9c9271ae44 * Remove unwanted code. 2021-12-09 14:37:41 +08:00
李玉春 c80b8d09e0 Merge branch 'sgm_45818' into 'kanban'
* Code for task #45818.

See merge request easycorp/zentaopms!854
2021-12-09 06:36:48 +00:00
孙广明 ad53ead5ba * Fix code details. 2021-12-09 14:33:23 +08:00
liumengyi 840082e4c1 * Finish task #45823. 2021-12-09 14:27:21 +08:00
孙广明 b7480bb257 Merge branch 'sprint/30_zhouxin_45792' into 'kanban'
Finish task #45792.

See merge request easycorp/zentaopms!844
2021-12-09 06:19:40 +00:00
孙广明 9824f4c6ac * Code for task #45818. 2021-12-09 14:11:49 +08:00
孙广明 12ce541d9e * Code for task #45818. 2021-12-09 10:50:05 +08:00
xieqiyu 8298f778e7 * Fix bug#17251. 2021-12-09 10:34:47 +08:00
hufangzhou 1517a800e2 * Fix an error for lang item. 2021-12-09 10:34:47 +08:00
tianshujie 2030bbd11c * Fix bug #17173. 2021-12-09 10:34:47 +08:00
hufangzhou c7d5310496 * Fix bug #16792. 2021-12-09 10:34:47 +08:00
hufangzhou 5287e87410 * Fix bug #17276. 2021-12-09 10:34:47 +08:00
hufangzhou 0d7f5f6e2d * Adjust the code. 2021-12-09 10:34:47 +08:00
hufangzhou e408f91d1f * Fix bug #17269, bug #16975. 2021-12-09 10:34:47 +08:00
tianshujie ec5d481dc8 * Fix bug #17272. 2021-12-09 10:34:47 +08:00
mayue 559c3879c3 * Optimize code #17248,17246. 2021-12-09 10:34:47 +08:00
tianshujie 7c3a8dc753 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
mayue 1111d59ed9 * Fix bug #17248,17246. 2021-12-09 10:34:47 +08:00
mayue 147470bf29 * Fix bug #17248,17246. 2021-12-09 10:34:47 +08:00
hufangzhou b2336fc180 * Fix bug #17263. 2021-12-09 10:34:47 +08:00
xieqiyu 4be580309c * Fix bug#17251. 2021-12-09 10:34:47 +08:00
tianshujie d33c071177 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
xieqiyu 9f168793fe * Fix bug#17267. 2021-12-09 10:34:47 +08:00
hufangzhou 83cc442fc3 * Fix bug #17261. 2021-12-09 10:34:47 +08:00
孙广明 eb3005cb9b * Fix program kanban error. 2021-12-09 10:34:47 +08:00
tianshujie 33971a4671 * Fix bug #17243. 2021-12-09 10:34:47 +08:00
孙广明 9db7d96139 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
孙广明 44bbe31440 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
xieqiyu ddea40c56a * Modify style. 2021-12-09 10:34:47 +08:00
xieqiyu 6aca5f10c0 * Delete unused code. 2021-12-09 10:34:47 +08:00
tianshujie 6219e2323b * Fix bug #17208. 2021-12-09 10:34:47 +08:00
孙广明 14b272a1af * Merge 169 untrack file to master. 2021-12-09 10:34:47 +08:00
hufangzhou 32c7a078a7 * Fix the code error. 2021-12-09 10:34:47 +08:00