孙广明
|
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 |
|
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 |
|
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 |
|
王怡栋
|
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 |
|
孙广明
|
ce422e102f
|
* Fix my - preference bug.
|
2022-03-31 11:31:38 +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 |
|
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 |
|
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 |
|