Commit Graph
3407 Commits
Author SHA1 Message Date
孙华伟 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
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
Hao Sun 56e9a9ce9d * try to redirect to index/index when access iframe page directly. 2022-03-25 20:48:18 +08:00
hufangzhou ec34fa3832 * Update the library of parse markdown. 2022-03-25 14:46:14 +08:00
hufangzhou fac6327ee8 * Update the library of parse markdown. 2022-03-25 14:13:54 +08:00
Wenrui LI aed115d5cf * remove score notice for lite vision, bug #21119. 2022-03-25 11:11:10 +08:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
2022-03-24 07:45:13 +00:00
王怡栋 7d3fa9fbab * code for task #51509. 2022-03-24 14:56:40 +08:00
zenggang dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
Hao Sun 099d927657 * fix UI for product kanban. 2022-03-24 13:31:05 +08:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
Zongjun Lan b76661202c remove code 2022-03-23 13:49:20 +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
孙广明 a2a191b421 Merge branch 'liyuchun_bug_17235' 2022-03-22 15:45:41 +08:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
liyuchun b1ed52dd44 * Fix bug #17333. 2022-03-22 14:22:33 +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
王怡栋 ff22527151 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51306,#51304

See merge request easycorp/zentaopms!2395
2022-03-22 01:17:19 +00:00
Zongjun Lan 1e8b5800be * fix task #51306,#51304 2022-03-22 09:16:16 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun 2c276b4322 Merge branch 'devops24' 2022-03-22 08:44:37 +08:00
liyuchun 8b2d19b30c * Fix bug #20580. 2022-03-21 16:47:57 +08:00
Zongjun Lan 3d05fdb119 * fix task #51306,#51304 2022-03-21 14:50:58 +08:00
王怡栋 24442be3c5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)

See merge request easycorp/zentaopms!2357
2022-03-18 01:58:27 +00:00
tanghucheng ec5f6244dd * Fix bug #20906. 2022-03-18 09:18:34 +08:00
Zongjun Lan ad622ccb02 * fix bug #t 2022-03-17 15:58:35 +08:00