Commit Graph
307 Commits
Author SHA1 Message Date
zhouxudong c42f97c564 * Optimization task #64884. 2022-08-19 06:04:44 +00:00
tianshujie c34c0276b2 * Finish task #63692. 2022-08-09 16:18:18 +08:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tianshujie 1200e97722 * Finish task #63692. 2022-08-09 15:19:16 +08:00
liumengyi 3dc8d9c097 * Fix issue #710. 2022-08-05 10:18:43 +08:00
liumengyi 96c59fdf52 * Fix bug #24337. 2022-07-21 10:22:00 +08:00
liumengyi 72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
孙广明 cb01084a13 Merge branch 'sprint/215_liumengyi_25230' into 'master'
* Fix bug #25230, #25200,#24929.

See merge request easycorp/zentaopms!4579
2022-07-15 06:17:32 +00:00
孙广明 900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00
tianshujie 656cc5f060 * Fix bug #25321. 2022-07-15 14:07:32 +08:00
liumengyi 7b9c5e6d52 * Fix bug #25230. 2022-07-15 13:42:13 +08:00
mayue a8dc623084 * Fix bug . 2022-07-15 13:13:28 +08:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
mayue 3cfa290a92 * Fix bug #24404. 2022-07-13 11:31:57 +08:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
孙广明 1e873272b3 Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.

See merge request easycorp/zentaopms!4476
2022-07-13 02:17:12 +00:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
tianshujie 1d1441f17f * Fix bug #25070. 2022-07-12 14:22:37 +08:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
liumengyi b5608fb799 * Fix bug #24754. 2022-07-06 08:41:51 +08:00
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
tianshujie f186662f35 * Transfer variable. 2022-07-05 15:31:23 +08:00
tianshujie 4c4e67f7e8 * Finish task #59475. 2022-07-05 14:08:00 +08:00
tianshujie 1bae5b38d1 * Finish task #59472. 2022-07-05 14:00:34 +08:00
tianshujie e29794271a * Delete extra blank lines. 2022-07-05 13:19:56 +08:00
tianshujie 4e05cb1916 * Finish task #59472. 2022-07-05 13:19:03 +08:00
tianshujie 17a8e9dcd5 * Changing the name of a function. 2022-07-05 08:47:45 +08:00
tianshujie 21d8a543a4 * Fix bug #24721. 2022-07-04 17:20:35 +08:00
tianshujie 3028701a06 * Finish task #59472. 2022-07-04 17:18:20 +08:00
王怡栋 4bacc1b95f Merge branch 'sprint/211_liumengyi_59468' into 'master'
* Finish task #59468.

See merge request easycorp/zentaopms!4316
2022-07-04 07:04:37 +00:00
liumengyi 247458ba1e * Optimize code of task #59468. 2022-07-04 15:03:49 +08:00
王怡栋 04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
tianshujie 6fc6d25a48 * Finish task #58554. 2022-07-04 14:48:24 +08:00
tianshujie 3e19862ed1 * Finish task #58554. 2022-07-04 14:12:36 +08:00
tianshujie ee701c75c9 * Finish task #58554. 2022-07-04 13:20:09 +08:00
liumengyi 7f9f5f662c * Finish task #59468. 2022-07-04 11:21:56 +08:00
zhouxudong 3970773281 * Fix bug for preview. 2022-06-30 09:08:57 +00:00
zhouxudong 502e3db733 * Iframe and disable will be invalid. 2022-06-30 08:35:22 +00:00
tianshujie 621e382cb6 * Finish task #58554. 2022-06-28 15:35:49 +08:00
zenggang 15feb917ce * Finish task#58772,58774,58775 2022-06-28 05:39:31 +00:00
mayue 6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
tianshujie c7b1da840f * Fix bug #56476. 2022-06-07 15:14:24 +08:00
tianshujie f30883a442 * Delete extra blank lines. 2022-05-25 17:28:44 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
zenggang 5b623fa3c4 * Finish task#55174 2022-05-25 01:12:37 +00:00