Commit Graph

511 Commits

Author SHA1 Message Date
wangyidong
b072234b4d * adjust for tid. 2022-05-24 15:53:57 +08:00
wangyidong
d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
孙广明
a064759431 Merge branch 'master_xieqiyu_2974' into 'master'
* Fix bug#2974.

See merge request easycorp/zentaopms!3118
2022-04-26 07:21:59 +00:00
mayue
eebfc3c70f * Fix bug #21980. 2022-04-26 03:23:02 +00:00
xieqiyu
530ee14eb2 * Fix bug#2974. 2022-04-26 10:44:56 +08:00
xieqiyu
cf9add7555 * Fix bug#2974. 2022-04-24 15:48:13 +08:00
caoyanyi
8d21788052 * Modify export data. 2022-04-24 09:21:54 +08:00
caoyanyi
be8dd4535c * Modify editor file path for app. 2022-04-24 08:48:26 +08:00
zhouxin
91aeb0a5b3 * Adjust code. 2022-04-15 02:35:39 +00:00
zhouxin
773895ec3b * Fix bug #11376. 2022-04-15 02:30:49 +00:00
孙广明
27a70ba3e7 Merge branch 'sunhuawei_fixbug_21689' into 'master'
*Fix bug#21689.

See merge request easycorp/zentaopms!2952
2022-04-14 09:25:19 +00:00
孙华伟
50f753359c Update config.php 2022-04-14 09:20:01 +00:00
孙华伟
cc3d12bf7d *Optimize the code. 2022-04-14 17:17:43 +08:00
孙华伟
d1db184695 *Fix bug#21689. 2022-04-14 17:11:32 +08:00
zhujinyong
d2fd124cb9 * Fix url of file. 2022-04-14 12:58:20 +08:00
songchenxuan
7de520a748 * Fix json_decode twice image data(url) not found. 2022-04-14 09:18:12 +08:00
Zongjun Lan
4a0897daf5 * fix bug #21419 2022-04-08 14:31:28 +08:00
caoyanyi
f2d6299356 * Fix bug #20662. 2022-03-21 10:39:41 +08:00
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
liumengyi
0ca866ed99 * Fix bug #50325. 2022-03-07 09:37:42 +08:00
tianshujie
59c9f0dbeb * Fix bug #20164. 2022-03-01 10:33:46 +08:00
王怡栋
5ee1c3e5e3 * code for paste image. 2022-03-01 08:54:27 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
zhouxudong
6559ada4a4 * Fix bug #19363. 2022-02-24 16:54:04 +08:00
zhouxudong
ed2c8c0b0a * Fix bug #19363. 2022-02-24 16:45:56 +08:00
tianshujie
70a665df3c * Modify course loading path. 2022-02-24 13:11:48 +08:00
tianshujie
f7f9450c79 * Modify course playback path. 2022-02-24 12:11:45 +08:00
zhujinyong
1f8e1b0021 * Fix return print() -> return. 2022-02-22 09:35:25 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
tianshujie
201aaf76c2 * Fix playback video issue. 2022-02-18 15:48:37 +08:00
tianshujie
c44dfa1788 * Modify the path to get the file. 2022-02-15 15:16:14 +08:00
tianshujie
4185f88f29 * Fix bug #18948,18836,18804. 2022-01-25 13:27:38 +08:00
王怡栋
03f1dd727e * code for task #45184 and adjust api. 2021-11-26 14:18:28 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋
3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
王怡栋
2c3d42360c * adjust for delete file session. 2021-10-28 16:26:16 +08:00
王怡栋
fb17df4424 * add upload file api. 2021-10-28 13:12:33 +08:00
王怡栋
edc45687fd * fix error. 2021-10-12 14:54:35 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie
4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
王怡栋
e9044ca0c9 * adjust for task #42832. 2021-09-26 12:11:44 +08:00
王怡栋
0d4c2da922 * finish task #42832. 2021-09-26 10:16:10 +08:00
liyuchun
3966f808a3 * Fix bug #15242. 2021-09-18 15:40:17 +08:00
zenggang
e546ca3adb * Fix variable name expression accuracy. 2021-09-10 10:10:48 +08:00
zenggang
f495f058ed * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 2021-09-08 15:31:11 +08:00
王怡栋
7ea86a2161 * adjust for session file name and fix error. 2021-08-30 14:57:13 +08:00
王怡栋
7b12c9ca2b * adjust for concat sign for build url. 2021-08-30 14:19:41 +08:00
sgm0422
75df1a3dda * Finish task #41722. 2021-08-27 15:39:38 +08:00