Commit Graph
554 Commits
Author SHA1 Message Date
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
zhouxudong 6b66d72804 * Finish task #60387. 2022-07-12 00:51:29 +00:00
zhouxudong c035264e3c * Finish task #60387 #60386 #60383. 2022-07-11 06:43:13 +00:00
leiyong f1e7a1350d * Fix bug#24812. 2022-07-07 05:40:39 +00:00
leiyong 5f0fdefe27 * Add comment. 2022-07-05 06:36:00 +00:00
leiyong 14a6406775 * Finish task#59532. 2022-07-05 05:06:27 +00:00
leiyong a9695b60f3 * Finish task#59531. 2022-07-05 02:56:18 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
caoyanyi 55fe921331 * Modify editor saved bug. 2022-05-31 10:20:37 +08:00
tianshujie e1299312d9 * Fix bug #22862. 2022-05-25 14:39:02 +08:00
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