Commit Graph

382 Commits

Author SHA1 Message Date
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
王怡栋
4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
孙广明
4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
孙广明
d388d2bfe7 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2671
2022-03-31 06:26:21 +00:00
xieqiyu
2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
tianshujie
16df973236 * Fix bug #16636. 2022-03-31 09:28:28 +08:00
Hao Sun
123aec72c4 * bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document. 2022-03-31 08:42:36 +08:00
tianshujie
317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie
0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie
63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
tianshujie
b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08:00
Hao Sun
cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
王怡栋
15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
tianshujie
a3b55806f5 * Fix bug #17212. 2022-03-25 10:25:37 +08:00
tianshujie
79e9ff2bdd * Fix bug #17187. 2022-03-25 09:52:44 +08:00
王怡栋
e504d28044 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21088,#21077

See merge request easycorp/zentaopms!2507
2022-03-24 08:39:06 +00:00
tianshujie
a5db3ca766 * optimize UI for kanban and fix drop rules not work. 2022-03-24 14:54:11 +08:00
Hao Sun
5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
Zongjun Lan
e3fe57931f * fix bug #21088 2022-03-24 14:21:29 +08:00
tianshujie
82e7beb7a0 * Fix bug #20923. 2022-03-23 10:20:55 +08:00
tianshujie
ccf11069cb * Fix bug #20975. 2022-03-22 15:20:47 +08:00
李玉春
2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
tianshujie
303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
王怡栋
792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
2022-03-22 03:09:56 +00:00
Zongjun Lan
4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong
24963355c1 * Fix bug #10978. 2022-03-19 15:06:54 +08:00
zhouxudong
b239f405f8 * Fix bug #10978. 2022-03-18 17:22:48 +08:00
tianshujie
5763c06094 * Fix bug #20914. 2022-03-17 20:37:53 +08:00
李玉春
0e26c165c2 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407

See merge request easycorp/zentaopms!2319
2022-03-17 01:31:38 +00:00
孙华伟
9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
tianshujie
63f53d23d6 * Fix bug #19321. 2022-03-15 17:04:56 +08:00
李玉春
59ff30de9d Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265
2022-03-15 05:43:03 +00:00
孙华伟
dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08:00
tianshujie
a7d66c5fae * Fix bug #20572. 2022-03-10 10:05:34 +08:00
mayue
00143907ce Fix bug #20545. 2022-03-09 16:49:03 +08:00
tianshujie
b4c0fff8e0 * Fix bug #20531. 2022-03-09 14:55:04 +08:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
tianshujie
a349c5bfeb * Fix bug #20530. 2022-03-09 14:01:41 +08:00
mayue
9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00