Commit Graph

4069 Commits

Author SHA1 Message Date
孙广明
051fd7b74f Merge branch 'sprint/195_mayue_bug#22880' into 'master'
* Fix bug #22880.

See merge request easycorp/zentaopms!3575
2022-05-25 03:28:42 +00:00
mayue
33730f3787 * Fix bug #22880. 2022-05-25 01:56:04 +00:00
lanzongjun
5eb84a81d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package_lanzongjun 2022-05-25 09:45:32 +08:00
lanzongjun
ae45c26343 * fix bug #54947 2022-05-25 09:45:13 +08: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
mayue
99b0f22baa * Fix bug #22632. 2022-05-20 09:10:22 +00:00
wangyidong
55b68c8a57 * adjust for round error. 2022-05-20 15:23:02 +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
xieqiyu
cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
tianshujie
4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
李玉春
0fa2c55ece Merge branch 'sprint/192_leiyong_task_54488' into 'master'
* Finish task#54488.

See merge request easycorp/zentaopms!3531
2022-05-20 00:29:05 +00:00
leiyong
143e9aff96 * Finish task#54488. 2022-05-19 09:32:47 +00:00
wangyidong
92e8a84230 * adjust for edit project. 2022-05-19 16:15:55 +08: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
zhouxin
83248ea9f7 * Fix bug #22651,#22645. 2022-05-19 05:52:24 +00:00
wangyidong
f289e08b9d * use buildOperateMenu method for build and projectrelease module. 2022-05-19 13:34:02 +08:00
Hao Sun
4d895c53f4 * task #54187, optimize kanbans with virtual scroll list. 2022-05-19 05:10:32 +00:00
xieqiyu
0cdfceebc9 * Code for task#54477. 2022-05-18 17:11:09 +08:00
zhouxin
c5be32065d * Fix bug. 2022-05-18 07:50:26 +00:00
zhouxin
094db2e505 * Adjust code. 2022-05-18 07:39:05 +00:00
zhouxin
5ef4782e82 * Finish task #54351. 2022-05-18 07:31:45 +00:00
zhouxudong
50b39ac2d5 * Finish task #54477. 2022-05-18 03:13:21 +00:00
zenggang
56363dbfeb * Adjust code 2022-05-17 08:52:33 +00:00
zenggang
5bb5dfce54 * Adjust code 2022-05-17 08:44:50 +00:00
zenggang
aef54696ec * Adjust code 2022-05-17 08:21:49 +00:00
zenggang
8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +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
wangyidong
759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08:00
mayue
5f936b6274 * Optimize code. 2022-05-13 09:37:27 +00:00
mayue
025238c3d8 * Fix api bug. 2022-05-13 08:17:12 +00:00
孙华伟
12b8250e06 *Fix bug #22453 #22455. 2022-05-13 13:17:10 +08:00
孙华伟
8ab8962a3f *Fix bug#22453 2022-05-13 11:16:52 +08:00
sunjun
845c84a1eb *sprint_sunjun_631 2022-05-13 02:53:47 +00:00
mayue
2bbc219944 * Fix bug #22411. 2022-05-13 02:33:54 +00:00
hufangzhou
74bf099c98 * Fix bug #22443. 2022-05-13 09:02:56 +08:00
tianshujie
6770b72b11 * Fix bug #22437. 2022-05-13 08:42:26 +08:00
mayue
44783b57a5 * Optimize code. 2022-05-12 08:52:17 +00:00
mayue
96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
wangyidong
aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
孙广明
f4724390f6 Merge branch 'sunhuawei_fixbug' into 'master'
*解决功能演示过程中出现的问题。

See merge request easycorp/zentaopms!3365
2022-05-12 07:36:01 +00:00
孙华伟
a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00
mayue
f15f8f0345 * Fix bug #22412. 2022-05-12 05:55:25 +00:00
mayue
53638cb9f2 * Fix bug. 2022-05-12 05:40:39 +00:00
李玉春
70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
孙华伟
6c2b318da4 *Optimize the code. 2022-05-12 13:21:44 +08:00
孙广明
a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
#   module/project/model.php
2022-05-12 05:01:42 +00:00
mayue
e65e7568b2 * Optimize code. 2022-05-12 03:37:22 +00:00
mayue
5a2ef22f3b * Optimize code. 2022-05-12 03:17:00 +00:00