Commit Graph
82 Commits
Author SHA1 Message Date
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
liumengyi 6aaf4f6308 * Fix bug for task #57090. 2022-06-14 14:39:55 +08:00
liumengyi d1a44ab424 * Finish task #57090. 2022-06-14 13:58:18 +08:00
liumengyi 2d4f3be98a * Finish task #57090. 2022-06-14 13:56:38 +08:00
zhouxudong 51f5d5bd3a * Finish task #56648. 2022-06-10 02:29:54 +00:00
tianshujie 3f1dc22664 * Finish task #56469. 2022-06-10 09:22:50 +08:00
王怡栋 a9981b0a33 Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
#   module/execution/control.php
#   module/execution/js/kanban.js
#   module/kanban/control.php
#   module/kanban/model.php
2022-06-10 01:05:39 +00:00
tianshujie b8792fcb90 * Finish task #56469. 2022-06-10 08:35:22 +08:00
liumengyi a5d2a87fdf * Finish task #56469. 2022-06-09 17:33:46 +08:00
王怡栋 084f66dd51 Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
#   module/kanban/model.php
2022-06-09 06:32:06 +00:00
zhouxudong 1da6718278 * Finish task #56362. 2022-06-09 05:30:57 +00:00
tianshujie 74f80b8d71 * Finish task #56469. 2022-06-09 13:24:58 +08:00
zhouxudong 89d4ecfd35 * Finish task #56362. 2022-06-09 03:43:20 +00:00
zhouxudong ea746e862f * Finish task #56362. 2022-06-09 03:04:12 +00:00
孙广明 0c0af6336a Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200'
Sprint/master zhouxudong 23026

See merge request easycorp/zentaopms!3777
2022-06-08 06:37:32 +00:00
zhouxudong edd66c028d * Fix bug #23026. 2022-06-08 06:25:06 +00:00
zhouxudong 607a871ddf * Finish task #56396. 2022-06-07 06:09:44 +00:00
zhouxudong 1a952376fe * Finish task #56396. 2022-06-07 05:44:06 +00:00
zhouxudong 0f645a096e * Finish task #56396. 2022-06-07 05:39:44 +00:00
tianshujie 814f1a597f * Fix bug #23255. 2022-06-06 15:07:57 +08:00
liumengyi 7a14f8a946 * Fix bug #23213. 2022-06-02 16:03:40 +08:00
liumengyi 4d2c34c122 * Fix bug #23213. 2022-06-02 15:59:57 +08:00
李玉春 d36ec41688 Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen'
# Conflicts:
#   www/js/zui/kanban/min.js
2022-06-02 05:20:38 +00:00
Hao Sun c1abc19882 * fix virtual rendering not work when kanban enter fullscreen 2022-06-02 04:11:59 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
liumengyi 06a0bb6f03 * Fix bug #23110, #23109. 2022-06-01 16:27:03 +08:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
zhouxudong 55ab5ee69d * Finish task #54981 #54982. 2022-05-25 02:31:02 +00:00
zhouxudong ff0edfa042 * Finish task #54981 #54982. 2022-05-24 08:53:51 +00:00
Hao Sun cd95e6edba * task #54187, optimize kanban with a lot of cards with virtualList. 2022-05-19 04:24:47 +00:00
xieqiyu b223f55900 * Code for task#54467. 2022-05-18 14:00:29 +08:00
xieqiyu 5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
tianshujie 896e36c90c * Finish task #53667. 2022-05-10 10:50:02 +08:00
zhouxudong 89bfe585c8 * Fix bug #20867. 2022-04-18 15:31:00 +08:00
tianshujie 534783603f Modify the popup style of the popup window. 2022-04-07 17:22:26 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
tianshujie 9d03df55de * Fix bug #19950. 2022-04-02 13:46:49 +08:00
tianshujie 8b2c7f1288 * Fix bug #21158. 2022-04-02 13:41:52 +08:00
tianshujie 317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie 63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
tianshujie b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08:00
Hao Sun cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
tianshujie a3b55806f5 * Fix bug #17212. 2022-03-25 10:25:37 +08:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
tianshujie ccf11069cb * Fix bug #20975. 2022-03-22 15:20:47 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00