Commit Graph
3881 Commits
Author SHA1 Message Date
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
2022-03-24 09:20:45 +00:00
李玉春 eef0da7fd0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2517
2022-03-24 09:16:36 +00:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
王怡栋 44d14b8c6a Merge branch 'sprint/lite6_lwr_fix_table_footer' into 'master'
* set z-index to table-footer, fix bug #21053.

See merge request easycorp/zentaopms!2509
2022-03-24 08:39:42 +00:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
Wenrui LI b6cc4de226 * set z-index to table-footer, fix bug #21053. 2022-03-24 14:25:57 +08:00
tianshujie 69bac81a9d * Fix bug #17395. 2022-03-24 11:01:00 +08:00
李玉春 c458dab32a Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072

See merge request easycorp/zentaopms!2496
2022-03-24 02:40:57 +00:00
tianshujie 9178a6e3b3 * Modify variable name. 2022-03-24 10:27:42 +08:00
tianshujie e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
孙广明 85c0bedc77 Merge branch 'master_xieqiyu_21037' into 'master'
* Fix bug#21037.

See merge request easycorp/zentaopms!2480
2022-03-23 09:27:21 +00:00
Zongjun Lan fe7cbfbced * fix task #51323 2022-03-23 16:36:15 +08:00
xieqiyu e52f5c78b7 * Fix bug#21037. 2022-03-23 14:57:59 +08:00
孙广明 0c79df3fb6 Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug

See merge request easycorp/zentaopms!2461
2022-03-23 00:53:36 +00:00
李玉春 26f84d495d Merge branch 'sprint/master_zhouxudong_16575' into 'master'
Sprint/master zhouxudong 16575

See merge request easycorp/zentaopms!2453
2022-03-22 08:18:36 +00:00
zhouxudong 0800d18c92 * Fix bug #16575. 2022-03-22 16:17:00 +08:00
zhouxin cebd0a33d5 Fix bug #13855. 2022-03-22 07:38:24 +00:00
王怡栋 6ed9d8fc31 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug#20968,20997.

See merge request easycorp/zentaopms!2430
2022-03-22 03:11:38 +00:00
tanghucheng 9370fcb1bf * Fix bug#20968,20997. 2022-03-22 10:55:19 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tanghucheng 987d0d0443 * Fix bug #20968,20964. 2022-03-21 17:00:42 +08:00
zhouxin 2ab2af045c Fix bug #13855. 2022-03-18 07:17:07 +00:00
王怡栋 5117bf7541 * fix bug #15347,15345. 2022-03-17 11:26:01 +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
李玉春 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
孙华伟 a2d2db7b27 *Fix bug#17639 2022-03-15 13:21:14 +08:00
tianshujie 91e99b699b * Fix bug #20751. 2022-03-15 09:36:13 +08:00
zhouxin bfa1f3940d Fix bug #19818. 2022-03-14 08:40:16 +00:00
李玉春 2ec1dd38b4 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639

See merge request easycorp/zentaopms!2237
2022-03-14 08:28:27 +00:00
孙华伟 951a3ab1af *Fix bug#17639 2022-03-14 16:26:45 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
孙华伟 60e271f10a *fix bug#17639 2022-03-14 15:31:29 +08:00
孙广明 3a491529c7 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2213
2022-03-11 07:50:07 +00:00
tanghucheng fb78d74984 * Fix bug. 2022-03-11 15:48:25 +08:00
tianshujie e20c497d01 * Fix bug #20678. 2022-03-11 14:51:33 +08:00
李玉春 abad40f8f6 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2196
2022-03-11 02:42:52 +00:00
孙华伟 38ddffdd3f * 2022-03-11 10:39:39 +08:00
孙华伟 e4f3113301 *Fix bug#17639 2022-03-11 10:36:44 +08:00
孙华伟 1dd0399e02 *Fix bug #17639. 2022-03-11 08:33:09 +08:00
zhouxin 38ebc88fd5 Fix bug. 2022-03-10 03:20:19 +00:00
zhouxin ccdcec9e32 Fix bug 50414. 2022-03-10 01:49:52 +00:00
tianshujie f42695af2c * Modify the default width of the project name. 2022-03-08 09:57:14 +08:00
tianshujie 19017161b6 * Delete useless variables. 2022-03-08 09:45:21 +08:00
tianshujie 23f8d33293 * Add variable judgment. 2022-03-08 08:59:15 +08:00
tianshujie c2f14bb9c2 * Finish task #50318. 2022-03-08 08:53:55 +08:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
tianshujie 5b2b646db3 * Fix bug #20328. 2022-03-04 16:29:56 +08:00
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
liyuchun adee975255 Merge branch 'sprint/sunhao/task49295' 2022-03-02 13:48:36 +08:00