Commit Graph

1792 Commits

Author SHA1 Message Date
zhouxudong
189ea8b1a7 * Fix bug #22722. 2022-05-24 06:33:04 +00:00
zhouxudong
3012bbd26c * Fix bug #22722. 2022-05-24 03:02:05 +00:00
zhouxudong
b57ec6aef4 * Fix bug #22722. 2022-05-24 02:59:16 +00:00
zhouxudong
d41ea8cfc2 * Finish bug #22722. 2022-05-24 02:42:29 +00: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
孙广明
747a7af788 Merge branch 'sprint190_zg_54192' into 'master'
* Add project name

See merge request easycorp/zentaopms!3516
2022-05-20 01:40:18 +00:00
王怡栋
857d4ce63a Merge branch 'sprint/master_zhouxudong_54478' into 'master'
* Finish task #54478.

See merge request easycorp/zentaopms!3533
2022-05-20 00:57:51 +00:00
zhouxudong
ab9f80ecfb * Finish task #54478. 2022-05-19 08:52:19 +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
zenggang
463ff11e9d * Add project name 2022-05-19 07:03:55 +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
zhouxin
f08ea8b043 * Adjust code. 2022-05-19 03:15:13 +00:00
zhouxin
8a2e6d63cb * Fix bug. 2022-05-19 03:07:55 +00:00
李玉春
4b7fd6beee Merge branch 'sprint/191_liumengyi_54318' into 'master'
* Finish task #54318.

See merge request easycorp/zentaopms!3502
2022-05-19 02:45:46 +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
liumengyi
dee4ff7043 * Finish task #54318. 2022-05-19 08:55:27 +08:00
tianshujie
ae9264e2db * Fix bug #22644. 2022-05-18 17:11:28 +08:00
孙广明
bfdcc7b924 Merge branch 'sunhuawei_fixbug_22616' into 'master'
*Fix bug#22616.

See merge request easycorp/zentaopms!3479
2022-05-18 07:56:29 +00:00
liumengyi
be5daac0ba * Fix bug #22628. 2022-05-18 15:23:12 +08:00
xieqiyu
b223f55900 * Code for task#54467. 2022-05-18 14:00:29 +08:00
孙华伟
b59fb9cc1c *Fix bug#22616. 2022-05-18 13:43:48 +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
liumengyi
e83da7c524 * Fix bug for task #54336. 2022-05-18 11:15:21 +08:00
wangyidong
e9289b68d5 * adjust for data. 2022-05-18 11:11:11 +08:00
liumengyi
aacfdcdc1c * Fix bug for task #54336. 2022-05-18 11:10:57 +08:00
xieqiyu
5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
王怡栋
ad6b686c0d Merge branch 'master_xieqiyu_54467' into 'master'
* Finish task#54467.

See merge request easycorp/zentaopms!3466
2022-05-18 01:52:49 +00:00
xieqiyu
a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00
liumengyi
2f8e2e03e3 * Finish task #54336. 2022-05-18 08:54:40 +08:00
孙广明
33de37f468 Merge branch 'sprint/190_zg_54192' into 'master'
* Finish task#54192,54196

See merge request easycorp/zentaopms!3449
2022-05-17 08:53:21 +00:00
zenggang
56363dbfeb * Adjust code 2022-05-17 08:52:33 +00:00
孙广明
268d3c3bcf * Finish task #54218. 2022-05-17 16:04:39 +08:00
zenggang
8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
孙广明
270715e54b Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631

See merge request easycorp/zentaopms!3410
2022-05-17 01:15:01 +00:00
sunjun
7e9466abbd sprint_sunjun_631 2022-05-16 21:08:04 +08:00
王怡栋
cd2b17e27b Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of burn when have no data in burn datatable.

See merge request easycorp/zentaopms!3417
2022-05-16 05:06:14 +00:00
王怡栋
2cdf81eda4 Merge branch 'sprint/master_zhouxudong_22441' into 'master'
Sprint/master zhouxudong 22441

See merge request easycorp/zentaopms!3411
2022-05-16 05:05:37 +00:00
xieqiyu
ae00461660 * Fix bug of burn when have no data in burn datatable. 2022-05-16 11:50:54 +08:00
zhouxudong
53102c368e * Fix bug #22441. 2022-05-16 03:28:40 +00:00
xieqiyu
e1942b98b2 * Show execution deadline at burn in view page. 2022-05-16 11:13:11 +08:00
sunjun
073ee90d40 sprint_sunjun_631 2022-05-16 11:10:20 +08:00
zhouxudong
a5783fa37c * Fix bug #22441. 2022-05-16 01:55:08 +00:00
zhouxudong
d1d05a067e * Fix bug #22441. 2022-05-16 01:38:43 +00:00