Commit Graph
52 Commits
Author SHA1 Message Date
sunguangming 728834da26 * Finish task #62733. 2022-08-04 09:49:35 +08:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
leiyong aec5b3612e * Finish task#56384. 2022-06-09 06:23:50 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
tianshujie 8b0bd45bf6 * Build add delete flag. 2022-01-25 10:39:17 +08:00
xieqiyu 053985fb05 * Code for task#47988. 2022-01-24 23:12:40 +08:00
tianshujie c1faac726f * Finish task #47992. 2022-01-24 18:26:16 +08:00
tianshujie 7a7ad37f3c * Finish task #47990. 2022-01-24 18:16:28 +08:00
tianshujie bffc71132d * Add permission judgment. 2022-01-24 16:58:14 +08:00
孙广明 72de0a1b9c Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/js/view.js
#   module/kanban/model.php
2022-01-24 07:28:48 +00:00
xieqiyu 7570801b1d * Modify the review code. 2022-01-24 14:34:37 +08:00
tianshujie 2fe1b4b744 * Encapsulate the method for obtaining card data. 2022-01-24 13:22:25 +08:00
zhouxin ac00d73a20 Finish task #47982. 2022-01-21 01:23:30 +00:00
zhengrunyu 571baaccce adjust card color and margin. 2021-12-23 14:25:39 +08:00
liumengyi 8712f7640a * Finish task #46156. 2021-12-21 08:37:40 +08:00
tianshujie 13fe70296a * Ajust code of kanban. 2021-12-17 15:20:10 +08:00
tianshujie f58bbf9ad1 Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151 2021-12-16 14:37:41 +08:00
孙广明 2d2c70abe4 Merge branch 'kanban' into 'sprint/177_tianshujie_46148'
# Conflicts:
#   module/kanban/control.php
#   module/kanban/model.php
2021-12-16 06:28:32 +00:00
tianshujie 99095f8785 * Add a sub-column page. 2021-12-16 14:18:57 +08:00
tianshujie af350d6db2 * Finish task #46148. 2021-12-16 10:07:41 +08:00
liumengyi 4716224337 * Finish task #46150. 2021-12-15 17:46:30 +08:00
tianshujie 66174b2341 * Add close space function. 2021-12-15 11:31:02 +08:00
liumengyi 4244e0cc23 * Remove useless code. 2021-12-14 13:54:53 +08:00
liumengyi 7fded68a0d * Fix bug for view card. 2021-12-14 13:53:14 +08:00
孙广明 d75774cafc Merge branch 'kanban' into 'sprint/177_tianshujie_card'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-12-13 08:11:03 +00:00
tianshujie 6a894bc7fb * Finish task #45829. 2021-12-13 15:37:33 +08:00
孙广明 91b700ec42 * Fix code details. 2021-12-13 14:59:43 +08:00
孙广明 557afc06ef * Code for task #45819. 2021-12-13 14:42:56 +08:00
李玉春 c8879884c0 Merge branch 'kanban' into 'sgm_kanbanaction'
# Conflicts:
#   module/kanban/js/view.js
2021-12-10 07:18:22 +00:00
孙广明 b9707ddb68 * Finish task #45827. 2021-12-10 14:00:22 +08:00
liumengyi 3a7ad7dad9 * Finish task #45830. 2021-12-10 13:43:23 +08:00
孙广明 c4ff55306b Merge branch 'kanban' into 'sprint/177_zhengrunyu_45882'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/model.php
2021-12-10 02:10:15 +00:00
liumengyi 37d9aaeb3a * Finish task #45825. 2021-12-10 09:28:40 +08:00
zhengrunyu 2aa3c3bbcb *Finish task #45882. 2021-12-10 09:18:05 +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 a3e9d350eb * Finish task #45817. 2021-12-09 15:19: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
liumengyi 840082e4c1 * Finish task #45823. 2021-12-09 14:27:21 +08:00
孙广明 12ce541d9e * Code for task #45818. 2021-12-09 10:50:05 +08:00
liumengyi 7ea719984d * Add kanban space edit function. 2021-12-09 08:59:40 +08:00
tianshujie a0e40c020d * Add Kanban space creation function. 2021-12-08 15:38:45 +08:00
孙广明 c749aeb0cb Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
Finish Task #43407,43420

See merge request easycorp/zentaopms!188
2021-10-27 09:03:25 +00:00
xiawenlong 5b0458b841 * Finish Task #43407,43420 2021-10-27 16:53:15 +08:00
孙广明 81603f04bd * Finish task #43394, #43395, #43396. 2021-10-27 16:40:30 +08:00
liyuchun c0502c85fd * Code for task #43503. 2021-10-27 10:35:51 +08:00
liyuchun c45866a3a3 * Code for task #43519. 2021-10-26 15:24:09 +08:00