Commit Graph

421 Commits

Author SHA1 Message Date
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
liumengyi
2f8e2e03e3 * Finish task #54336. 2022-05-18 08:54:40 +08:00
王怡栋
a9d13faa1a Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
#   module/execution/js/edit.js
2022-05-12 05:20:13 +00:00
王怡栋
5674160b7e Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
2022-05-12 05:05:25 +00:00
zhouxudong
13e965e484 * Finish task #53651. 2022-05-12 05:02:51 +00:00
zhouxudong
f98d82234a * Finish task #53651. 2022-05-12 03:57:23 +00:00
zhouxudong
65fff67e58 * finish task #53651. 2022-05-12 00:30:00 +00:00
xieqiyu
ce7c0afdc1 * Finish task#53666. 2022-05-11 18:24:13 +08:00
zhouxudong
675d2c2e86 * Fix bug #22339. 2022-05-11 08:49:22 +00:00
孙广明
622185aa65 Merge branch 'sprint/189_zhouxudong_53651' into 'master'
Sprint/189 zhouxudong 53651

See merge request easycorp/zentaopms!3323
2022-05-11 05:51:12 +00:00
zhouxudong
ca827e1d6c * Finish task #53651. 2022-05-11 05:32:48 +00:00
zhouxudong
da5cd2aa44 * Finish task #53651. 2022-05-11 03:02:28 +00:00
zhouxudong
1723a78c92 * Finish task #53651. 2022-05-10 09:11:06 +00: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
tianshujie
c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08:00
孙华伟
dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
zhujinyong
864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
zhouxudong
89bfe585c8 * Fix bug #20867. 2022-04-18 15:31:00 +08:00
Hao Sun
e1a11341c6 * refactor: format. 2022-04-18 10:34:14 +08:00
Hao Sun
af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
xieqiyu
68097e7725 * Fix bug#14595. 2022-04-11 17:36:44 +08:00
王怡栋
6c07213aa2 Merge branch 'sprint/tianshujie_bug18781' into 'master'
Modify the popup style of the popup window.

See merge request easycorp/zentaopms!2809
2022-04-07 09:25:16 +00:00
孙广明
d9345f6a62 Merge branch 'master_xieqiyu_21550' into 'master'
* Fix bug#21550.

See merge request easycorp/zentaopms!2807
2022-04-07 09:23:31 +00:00
tianshujie
534783603f Modify the popup style of the popup window. 2022-04-07 17:22:26 +08:00
xieqiyu
8aaaeafcb3 * Modify review code. 2022-04-07 17:22:15 +08:00
xieqiyu
1a59190992 * Fix bug#21550. 2022-04-07 17:09:41 +08:00
tianshujie
14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
tianshujie
2af6c7df8b * Fix bug #20977. 2022-04-07 14:38:41 +08:00
tianshujie
479c647cf5 * Fix code style issues. 2022-04-02 15:01:16 +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