Commit Graph
652 Commits
Author SHA1 Message Date
Hao Sun 29ae8cb398 * fix kanban lane height with auto height option. 2022-06-06 06:58:38 +00:00
孙广明 1dd0b6c022 Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.

See merge request easycorp/zentaopms!3725
2022-06-02 08:04:56 +00:00
liumengyi 7a14f8a946 * Fix bug #23213. 2022-06-02 16:03:40 +08:00
tianshujie 653e681ed2 * Fix bug #23213. 2022-06-02 16:02:19 +08:00
liumengyi 4d2c34c122 * Fix bug #23213. 2022-06-02 15:59:57 +08:00
李玉春 88da2f7565 Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
Sprint/197 tianshujie fixbug

See merge request easycorp/zentaopms!3714
2022-06-02 05:27:06 +00: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
tianshujie fb239cfa06 * Fix bug #23194. 2022-06-02 12:22:58 +08:00
Hao Sun c1abc19882 * fix virtual rendering not work when kanban enter fullscreen 2022-06-02 04:11:59 +00:00
李玉春 fd269a4777 Merge branch 'master' into 'sprint/sunhao/fix_kanban'
# Conflicts:
#   www/js/zui/kanban/min.css
#   www/js/zui/kanban/min.js
2022-06-02 03:29:40 +00:00
Hao Sun 96454565b2 * adjust cards size in kanban. 2022-06-02 03:02:45 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
孙广明 c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00
liumengyi 06a0bb6f03 * Fix bug #23110, #23109. 2022-06-01 16:27:03 +08:00
zhouxin 2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
tianshujie 78d38d7723 Merge branch 'sprint/197_tianshujie_55675' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/197_tianshujie_55675 2022-06-01 13:51:08 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
liumengyi 62445ea7b0 * Code format. 2022-05-27 10:59:23 +08:00
liumengyi f889692b40 * Remove empty line. 2022-05-27 10:47:19 +08:00
liumengyi 87ef728908 * Fix bug #23012. 2022-05-27 10:46:02 +08:00
王怡栋 2c4bbef9a6 Merge branch 'sprint/master_zhouxudong_54981' into 'master'
Sprint/master zhouxudong 54981

See merge request easycorp/zentaopms!3578
2022-05-25 02:33:04 +00:00
zhouxudong 55ab5ee69d * Finish task #54981 #54982. 2022-05-25 02:31:02 +00:00
liumengyi 7baafc5ca0 * Code format. 2022-05-25 10:07:06 +08:00
zenggang 7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
zhouxudong ff0edfa042 * Finish task #54981 #54982. 2022-05-24 08:53:51 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
hufangzhou 9f1ac822bf * Adjust the code. 2022-05-20 18:55:46 +08:00
李玉春 3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
2022-05-20 03:09:22 +00:00
tianshujie 4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
孙广明 97f5dcdc9f Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555

See merge request easycorp/zentaopms!3508
2022-05-20 01:41:31 +00:00
zenggang de835ecb3e * Fix bug#22555 2022-05-19 08:08:39 +00:00
孙广明 57a7f0bcef Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* task #54187, optimize kanban with a lot of cards with virtualList.

See merge request easycorp/zentaopms!3511
2022-05-19 07:43:19 +00:00
Hao Sun 4bcdcce53a * task #54187, optimize perf for page execution/kanban and kanban/view 2022-05-19 07:41:17 +00:00
Hao Sun 4d895c53f4 * task #54187, optimize kanbans with virtual scroll list. 2022-05-19 05:10:32 +00:00
Hao Sun cd95e6edba * task #54187, optimize kanban with a lot of cards with virtualList. 2022-05-19 04:24:47 +00:00
孙广明 6f150a9ea8 Merge branch 'master' into 'sprint/191_zhouxin_54352'
# Conflicts:
#   module/datatable/config.php
2022-05-19 03:18:24 +00:00
李玉春 6b667195b1 Merge branch 'sprint/191_tianshujie_54329' into 'master'
Sprint/191 tianshujie 54329

See merge request easycorp/zentaopms!3496
2022-05-19 02:22:36 +00:00
zhouxin 235b04f76e * Finis task #54352. 2022-05-19 02:02:22 +00:00
tianshujie ae9264e2db * Fix bug #22644. 2022-05-18 17:11:28 +08:00
xieqiyu b223f55900 * Code for task#54467. 2022-05-18 14:00:29 +08:00
孙广明 cecff5ddec Merge branch 'sprint/191_liumengyi_54336' into 'master'
Sprint/191 liumengyi 54336

See merge request easycorp/zentaopms!3474
2022-05-18 03:17:58 +00:00
xieqiyu 5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
xieqiyu a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00