Commit Graph

923 Commits

Author SHA1 Message Date
tanghucheng
02c856cf7d * Fix bug #21280. 2022-03-29 16:48:19 +08:00
xieqiyu
3cbebadd60 * Fix bug#21277. 2022-03-29 15:54:29 +08:00
liyuchun
1fcbef1a79 * Fix bug #13194. 2022-03-29 13:45:36 +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
Hao Sun
56e9a9ce9d * try to redirect to index/index when access iframe page directly. 2022-03-25 20:48:18 +08:00
hufangzhou
fac6327ee8 * Update the library of parse markdown. 2022-03-25 14:13:54 +08:00
zenggang
dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00: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
王怡栋
5117bf7541 * fix bug #15347,15345. 2022-03-17 11:26:01 +08:00
tanghucheng
18cd2a98aa * Adjust for vision name. 2022-03-17 10:24:41 +08:00
zhouxin
bfa1f3940d Fix bug #19818. 2022-03-14 08:40:16 +00:00
tianshujie
920f64f572 * Modify the api error report. 2022-03-14 15:57:02 +08:00
xieqiyu
e8a7995351 * Fix bug#16424,#20555. 2022-03-10 10:32:41 +08:00
liumengyi
dd7d8902b8 * Finish task #50321. 2022-03-07 13:38:02 +08:00
孙广明
3d2b198848 * Code for project other menu. 2022-03-07 13:13:13 +08:00
王怡栋
da92204f31 * code for lite version. 2022-03-07 09:59:56 +08:00
tianshujie
4f17795ffd * Fix bug #20266. 2022-03-02 15:15:37 +08:00
tianshujie
0bb3371484 * Fix bug #20245. 2022-03-02 14:48:50 +08:00
王怡栋
83ce0b8052 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #20238.

See merge request easycorp/zentaopms!2041
2022-03-02 03:19:32 +00:00
孙广明
b33cb32e4b Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.

See merge request easycorp/zentaopms!2031
2022-03-02 03:05:06 +00:00
孙广明
c3c1351400 * Fix bug #20238. 2022-03-02 10:53:30 +08:00
王怡栋
f71f500755 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-02 10:34:40 +08:00
王怡栋
76eea1f5d9 * adjust for global create. 2022-03-02 10:06:19 +08:00
tanghucheng
87aa943546 * Fix bug for classic. 2022-03-02 09:04:20 +08:00
tianshujie
cfb4b274a4 * Fix bug #20170. 2022-03-01 20:06:44 +08:00
tianshujie
ecf679aeaf * Fix the problem of calling config error in static method. 2022-02-25 09:12:19 +08:00
孙广明
32f322ec51 Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version

See merge request easycorp/zentaopms!1960
2022-02-24 09:04:10 +00:00
tianshujie
30d3fc1303 * Modify version judgment logic. 2022-02-24 16:21:58 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong
c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
zhujinyong
43998c45bb * Fix vision switcher. 2022-02-24 13:04:25 +08:00
zhujinyong
891b914fc9 * Format code. 2022-02-23 16:39:15 +08:00
孙广明
0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
孙广明
2276e1430f * Code for upgrade. 2022-02-23 10:49:29 +08:00