Commit Graph
572 Commits
Author SHA1 Message Date
hufangzhou 6f9d1f9fdb * Handle feedback #1707. 2022-12-09 06:37:38 +00:00
孔令茂 1dfe049a97 * Resolved feedback #508, fixed image display error when export to html. 2022-11-30 01:19:51 +00:00
chaideqing db08e26957 * Fix feedback #1446. 2022-11-29 08:48:10 +08:00
wangjianhua fc9bada77c * Fix comments. 2022-11-24 14:42:01 +08:00
wangjianhua 7646cf8613 * Fix wrong syntax. 2022-11-21 20:57:48 +08:00
wangjianhua 88007f7685 Merge branch 'master' into master_oss_wangjianhua 2022-11-21 14:36:59 +08:00
tanghucheng 0428c7e973 * Finish ticket #043. 2022-11-17 15:25:52 +08:00
wangjianhua 121e072d85 Merge branch 'master' into master_oss_wangjianhua 2022-11-16 16:36:36 +08:00
wangjianhua afd90092bb * Add function saveAsTempFile to file module. 2022-11-10 17:05:35 +08:00
wangyidong b8c4c2bb9d * code for task #75426,75427. 2022-11-10 14:13:29 +08:00
wangjianhua cd5749835e * Add function setFielAndRealPaths to file model. 2022-11-09 23:28:37 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
tanghucheng 142da875c3 * Fix bug #27891,27610. 2022-09-26 08:36:57 +08:00
sunguangming faa8fae956 * Code for task #69596. 2022-09-21 16:06:14 +08:00
dingyongliang d95bc9126c * bug #27487, adjust the button position. 2022-09-15 06:55:07 +00:00
dingyongliang ce4df54d24 * file input support mulitple. 2022-09-14 03:10:19 +00:00
xieqiyu 5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu 97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
xieqiyu 2bbb4df770 * Code for task#66954. 2022-08-31 20:29:26 +08:00
xieqiyu b026b7c494 * Code for task#66955. 2022-08-31 18:27:42 +08:00
xieqiyu 0fac1d1e95 * Code for task#66954. 2022-08-31 13:36:02 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
xieqiyu dedf5e6dc2 * Delete reset file name of story change page. 2022-08-26 09:14:16 +08:00
tanghucheng 8e93a462f6 * Fix bug for upload file. 2022-08-25 16:10:13 +08:00
tanghucheng a1b16e0132 * Fix bug #26265. 2022-08-23 21:03:50 +08:00
zhouxudong f3b134581f * Optimization task #64887. 2022-08-19 06:43:38 +00:00
王怡栋 5d28a2973f Merge branch 'sprint/229' into 'master'
Sprint/229

See merge request easycorp/zentaopms!5018
2022-08-19 00:50:35 +00:00
sunguangming ef679444bd * Code for file checkpriv bug. 2022-08-18 08:47:49 +08:00
sunguangming b175607c41 * Code for file checkpriv bug. 2022-08-18 08:25:37 +08:00
zhouxudong 41e6242736 * Finish task #64886. 2022-08-17 07:31:42 +00:00
zhouxudong d557c4eed6 * Finish task #64886. 2022-08-17 07:22:26 +00:00
zhouxudong cd36873ee9 * Finish task #64887. 2022-08-17 02:04:23 +00:00
zhouxudong a908f4faec * Finish task #64486. 2022-08-16 01:08:53 +00:00
zhouxudong f759bf78e5 * Finish task #64887. 2022-08-15 12:18:18 +00:00
zhouxudong 41507c49c2 * Finish task #64886. 2022-08-15 05:24:06 +00:00
zhouxudong 21866db309 * Fix bug. 2022-08-12 00:46:07 +00:00
sunguangming 5e2135766a * Finish task #64212. 2022-08-09 15:16:14 +08:00
王怡栋 204336881b Merge branch 'sprint/master_zhouxudong_60388' into 'master'
Sprint/master zhouxudong 60388

See merge request easycorp/zentaopms!4771
2022-08-04 01:21:52 +00:00
zhouxudong 8b0cb6a7ea * Finish task #60388. 2022-07-28 08:02:19 +00:00
zhouxudong 6bd5e46893 * Finish task #60388. 2022-07-28 07:53:49 +00:00
zhouxudong f85e8c2df5 * Finish task #60383. 2022-07-28 07:04:40 +00:00
zhouxudong d505caff81 * Finish task #60388. 2022-07-28 01:32:22 +00:00
zhouxudong 7c506f9bd7 * Finish task #60388. 2022-07-27 05:23:34 +00:00
caoyanyi 0eba61ac66 * Fix bug #24750. 2022-07-21 13:58:39 +08:00
zhouxudong 92c323d600 * Finish task #60388. 2022-07-15 05:14:48 +00:00
leiyong 9ea1185649 * Finish task#60378. 2022-07-12 09:10:05 +00:00
王怡栋 a063544f5f Merge branch 'master' into 'sprint/master_zhouxudong_60389'
# Conflicts:
#   module/file/view/buildform.html.php
#   module/file/view/viewfiles.html.php
2022-07-12 05:30:11 +00:00