Commit Graph

1082 Commits

Author SHA1 Message Date
xieqiyu
6fdcc5f826 * Modify review code for bug#23185. 2022-06-01 23:34:48 +08:00
xieqiyu
b0bac9dfae * Fix bug#23185. 2022-06-01 23:21:22 +08:00
xieqiyu
6e6d83b814 * Fix bug#23185. 2022-06-01 21:36:15 +08:00
xieqiyu
1a24cdbc80 * Fix bug#23185. 2022-06-01 21:29:30 +08:00
王怡栋
f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
tanghucheng
f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
xieqiyu
7255e0dedc * Add notes for task#55628. 2022-05-31 02:58:56 +08:00
xieqiyu
95f202ade2 * Code for task#55628. 2022-05-31 01:37:02 +08:00
xieqiyu
833e82205c * Code for bug#23055. 2022-05-29 22:16:17 +08:00
xieqiyu
a9ce5f8e01 * Restore code for task#54988. 2022-05-27 02:17:08 +08:00
xieqiyu
c33f911e59 * Modify review code. 2022-05-26 11:19:36 +08:00
xieqiyu
fce652ac7c * Finish task#54988. 2022-05-26 11:03:24 +08:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋
e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
leiyong
df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
xieqiyu
cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
leiyong
77a180d4ad * Fix bug#22713. 2022-05-20 00:37:44 +00:00
李玉春
088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
2022-05-19 07:53:10 +00:00
leiyong
4c14307de1 * Adjust CSS. 2022-05-19 07:44:47 +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
leiyong
4198e05c9e * Adjust code. 2022-05-19 06:53:37 +00:00
leiyong
d92c911062 * Finish task#54469. 2022-05-19 05:15:50 +00:00
Hao Sun
4d895c53f4 * task #54187, optimize kanbans with virtual scroll list. 2022-05-19 05:10:32 +00:00
leiyong
69fe59f541 * Finish task#54469. 2022-05-19 05:06:43 +00:00
zhouxudong
0485ec15a9 * Finish task #54474. 2022-05-19 02:32:48 +00:00
zhouxudong
8ebf5a47b6 Finish task #54474. 2022-05-19 02:19:28 +00:00
zhouxudong
496adec36a * Finish task #54473. 2022-05-19 00:52:15 +00:00
zhouxudong
5b33b75d41 * Finish task #54476 #54475 #54474. 2022-05-18 10:18:02 +00:00
wangyuting2
04041e6fb5 * Fix bug #22572. 2022-05-18 09:41:15 +08:00
wangyuting2
af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08:00
zenggang
8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
wangyidong
759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08:00
王怡栋
f27bae0fe6 Merge branch 'sprint/189_zg_bugs' into 'master'
* Fix bug#22451,22473,22475

See merge request easycorp/zentaopms!3390
2022-05-13 09:44:01 +00:00
zenggang
cc7f860ac0 * Fix bug#22451,22473,22475 2022-05-13 04:11:12 +00:00
孙华伟
183da95a35 *Fix bug#22454 2022-05-13 11:07:54 +08:00
孙广明
10a542cc35 Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs

See merge request easycorp/zentaopms!3374
2022-05-13 01:57:36 +00:00
zenggang
94bf6a70a2 * Adjust code 2022-05-13 00:44:07 +00:00
王怡栋
a47a3ad064 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-12 09:09:28 +00:00
zenggang
e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
lanzongjun
63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
孙华伟
3de0b23ab8 *Optimize the bug. 2022-05-12 13:26:19 +08:00
孙华伟
9c2926f59a *Optimize the code. 2022-05-12 13:23:11 +08:00
孙华伟
4f51081da0 *Fix bug#22367. 2022-05-12 11:03:36 +08:00
孙华伟
58cea27fc5 Update model.php 2022-05-12 02:16:52 +00:00
孙华伟
a3149121ac Update model.php 2022-05-12 01:55:48 +00:00
孙华伟
b1c6976f2f *Fix bug #22365. 2022-05-12 09:54:55 +08:00
孙广明
621e257ae1 Merge branch 'sprint189_zg_53653' into 'master'
Finish task#53653,53657

See merge request easycorp/zentaopms!3313
2022-05-11 09:37:07 +00:00
zenggang
a2b64debb9 * Adjust code 2022-05-11 09:24:30 +00:00
zenggang
0fe5a1884f * Adjust code 2022-05-11 09:11:13 +00:00
zenggang
2bc6e6b468 * Adjust code 2022-05-11 09:08:18 +00:00