Commit Graph
3383 Commits
Author SHA1 Message Date
孙广明 ac0eb8c657 Merge branch 'liyuchun_fixbug_21632' into 'master'
* Fix bug #21632.

See merge request easycorp/zentaopms!3024
2022-04-21 01:22:29 +00:00
王怡栋 884c145ce2 Merge branch 'fixbug' into 'master'
* Fix bug #21846.

See merge request easycorp/zentaopms!3019
2022-04-21 00:44:21 +00:00
王怡栋 21c0fbb067 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 17:19:32 +08:00
王怡栋 54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
mayue 05639579e0 * Fix bug. 2022-04-20 17:02:32 +08:00
liyuchun 284af0ded1 * Fix bug #21632. 2022-04-20 11:02:29 +08:00
zenggang 217cc71960 * Fix bug#14478,19305 2022-04-19 09:21:02 +00:00
tanghucheng 1cd310f27a * Code for bug #21370. 2022-04-19 15:23:29 +08:00
zenggang b19b84e0c5 * Adjust code 2022-04-18 07:52:10 +00:00
zenggang 1c8c50724d * Fix bug#18642,21572 2022-04-18 07:25:46 +00:00
王怡栋 0d0fcb0c2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 11:30:31 +08:00
王怡栋 a481ba2959 * adjust for check priv. 2022-04-18 11:26:21 +08:00
hufangzhou a629ac2c12 * Fix bug #20062. 2022-04-15 15:22:58 +08:00
王怡栋 26f19a6085 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-15 11:20:54 +08:00
王怡栋 b9ebcd6944 * code for bug #21655. 2022-04-15 11:20:28 +08:00
xieqiyu bcee37d2a9 * Fix bug#6959. 2022-04-14 14:10:09 +08:00
zhouxin 6e6deaa462 * Fix bug #21374. 2022-04-13 07:59:57 +00:00
zenggang 654da8565f * Fix bug#21649,21512 2022-04-12 03:15:39 +00:00
王怡栋 f7ded5c5cf Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2769
2022-04-07 08:38:10 +00:00
Hao Sun 2b9068f51c fix z-index conflict with pager dropmenu for fixed header in datatable. 2022-04-06 17:09:24 +08:00
Chenjianyu f0eaee1739 * Fix bug #52077, overwrite .main-actions-holder style to block infinite scrolling. 2022-04-06 17:04:36 +08:00
xieqiyu 55f3f11e48 * Fix bug#19711. 2022-04-02 15:44:34 +08:00
xieqiyu f9295faec3 * Fix bug#19711. 2022-04-02 15:39:03 +08:00
李玉春 82647a8138 Merge branch 'sunhuawei_fixbug_19073' into 'master'
*Fix bug#19073.

See merge request easycorp/zentaopms!2707
2022-04-01 09:20:25 +00:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
孙华伟 2c5a94c243 *Fix bug#19073. 2022-04-01 14:12:09 +08:00
王怡栋 f5c9b94b82 Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2687
2022-04-01 01:54:46 +00:00
Wenrui LI 7ecc17b836 * format code. 2022-04-01 08:57:30 +08:00
孙广明 ce422e102f * Fix my - preference bug. 2022-03-31 11:31:38 +08:00
王怡栋 6c078665da Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2636
2022-03-30 08:00:01 +00:00
tianshujie a93dcb0ec7 * Modify the link in the executive board. 2022-03-30 15:55:45 +08:00
xieqiyu 039f7f037d * Fix bug of check iframe. 2022-03-30 14:11:28 +08:00
tanghucheng 02c856cf7d * Fix bug #21280. 2022-03-29 16:48:19 +08:00
Wenrui LI 3446e4bf55 * fix xuan header hook not loaded. 2022-03-29 16:14:11 +08:00
Wenrui LI d1b1cb38c5 * fix xuan header hook not loaded. 2022-03-29 16:10:28 +08:00
xieqiyu 3cbebadd60 * Fix bug#21277. 2022-03-29 15:54:29 +08:00
qixinzhi 4e8cab4b66 * hide zentao client tutorial menu, task# 17992. 2022-03-29 14:54:12 +08:00
liyuchun 1fcbef1a79 * Fix bug #13194. 2022-03-29 13:45:36 +08:00
Zongjun Lan 4206ffb843 * fix bug #21181 2022-03-29 09:53:04 +08:00
tianshujie 7b6e89c8d6 * Fix bug #21213. 2022-03-29 09:07:47 +08:00
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master'
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
2022-03-28 09:01:06 +00:00
朱金勇 863f39ea81 Merge branch 'sprint/sunhao/bug19123' into 'master'
* bug #19123, skip to check iframe when url has "_single" param for debug mode.

See merge request easycorp/zentaopms!2584
2022-03-28 09:00:49 +00:00
朱金勇 0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master'
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
2022-03-28 09:00:40 +00:00
Hao Sun c39e01875c * bug #20928, support to affix region scrollbar in kanban. 2022-03-28 16:41:39 +08:00
Hao Sun cd4c0ae708 * bug #20927, limit affixed header in kanban container. 2022-03-28 15:50:08 +08:00
Hao Sun 710121485f * bug #19123, skip to check iframe when url has "_single" param for debug mode. 2022-03-28 15:41:55 +08:00
孙广明 0aa0f12057 Merge branch 'master_xieqiyu_20875' into 'master'
* Fix bug#20875.

See merge request easycorp/zentaopms!2564
2022-03-28 06:37:08 +00:00
Hao Sun 0cf598f418 * bug #21174, fix markdown preview not work as expected. 2022-03-28 14:09:23 +08:00
xieqiyu f500822991 * Fix bug#20875. 2022-03-28 10:11:39 +08:00