Commit Graph
3902 Commits
Author SHA1 Message Date
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie 04316599a4 * Modify the error. 2022-03-30 10:26:17 +08:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
sunjun 0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
tianshujie 7680057485 * Fix bug #18755. 2022-03-28 15:32:41 +08:00
sunjun 487c2a6694 *Fixbug #13852 2022-03-28 13:43:53 +08:00
李玉春 d726d5bfbb Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2574
2022-03-28 05:10:26 +00:00
tianshujie b125b0fc2c * Fix bug #21186. 2022-03-28 11:20:38 +08:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
sunjun 79016f3bf7 *Fixbug #13852 2022-03-28 10:00:29 +08:00
zenggang ae463ddd27 * Finish task#51139 2022-03-28 01:44:26 +00:00
sunjun e0363ea6aa *Fixbug #13852 2022-03-28 09:32:14 +08:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
tianshujie 7c46d9c61d * Fix bug #17291. 2022-03-25 12:51:59 +08:00
孙广明 e4189b329c * Fix whitelist bug. 2022-03-25 10:21:50 +08:00
朱金勇 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
sunjun 43bfd5a4c1 *Fixbug 21115 2022-03-24 16:52:03 +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
sunjun 65442bcc7f *Fix bug #13852 2022-03-24 08:54:24 +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