Commit Graph
2154 Commits
Author SHA1 Message Date
tanghucheng d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
tanghucheng c4510a152a * Code for port. 2022-08-08 09:48:07 +08:00
tanghucheng 1815b1e2e7 * Code for port. 2022-08-05 14:58:57 +08:00
tanghucheng a25170b099 * Code for lazyloading. 2022-08-05 13:06:57 +08:00
tanghucheng 28f896e84c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 08:11:14 +08:00
tanghucheng 289a559fa7 * Code for port. 2022-08-05 08:10:52 +08:00
王怡栋 2a03c9bfe3 Merge branch 'sprint/221_liumengyi_63455' into 'master'
* Finish task #63455.

See merge request easycorp/zentaopms!4797
2022-08-04 06:21:37 +00:00
tanghucheng 2b26be85d5 * Code for showimport view. 2022-08-04 14:10:49 +08:00
tanghucheng 5f4699ceec Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-04 14:10:36 +08:00
liumengyi 02a3c130c0 * Fix bug for task #63455. 2022-08-04 13:37:17 +08:00
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
liumengyi 8900769999 * Finish task #63455. 2022-08-04 09:47:16 +08:00
tanghucheng 8c653d2153 * Code for showimport view. 2022-08-04 00:04:32 +08:00
tanghucheng 825a0e94db * Code for testcase showimport. 2022-08-02 10:24:26 +08:00
tanghucheng 7898a041bc * Code for showimport. 2022-08-02 09:54:21 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
tanghucheng 96cef1ccfc * Code for bug export. 2022-07-25 09:23:26 +08:00
tanghucheng 178cced7e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 16:17:40 +08:00
tianshujie 737799378d * Fix bug #24702. 2022-07-22 15:49:22 +08:00
tianshujie f1998ad485 * Fix bug #24702. 2022-07-22 15:18:27 +08:00
tanghucheng ab6753ba94 * Code for showimport. 2022-07-22 14:18:36 +08:00
tanghucheng a12e616202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 14:18:04 +08:00
tianshujie 29a889ddcf * Fix bug #24702. 2022-07-22 12:03:23 +08:00
tanghucheng 566a9e8844 * Code for testcase showimport. 2022-07-22 10:53:37 +08:00
tanghucheng cbb5766fbe * Code for testcase exporttemplate. 2022-07-21 17:38:01 +08:00
tanghucheng 004561024f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-21 17:37:48 +08:00
tianshujie b8124e12f4 * Fix bug #25435. 2022-07-21 11:27:55 +08:00
tianshujie e122aa3be7 * Fix bug #25435. 2022-07-21 11:11:21 +08:00
tanghucheng 539663976e * Code for testcase export. 2022-07-20 16:02:07 +08:00
tanghucheng 18e857217f * Code for port. 2022-07-19 17:25:30 +08:00
王怡栋 7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
liumengyi 84c5bcd176 * Fix bug #24795. 2022-07-14 13:51:42 +08:00
王怡栋 e286a450fb Merge branch 'sprint/215_liumengyi_24491' into 'master'
* Fix bug #24491.

See merge request easycorp/zentaopms!4504
2022-07-13 05:33:00 +00:00
liumengyi cc31e0efa0 * Fix bug #24491. 2022-07-13 13:09:30 +08:00
liumengyi 424653ac7f * Fix bug #24896. 2022-07-13 11:23:50 +08:00
leiyong accd4feee5 * Adjust Modified Fields. 2022-07-13 02:57:28 +00:00
王怡栋 0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
2022-07-13 02:25:36 +00:00
liumengyi fab6829823 * Fix bug for task #60395. 2022-07-13 08:36:47 +08:00
leiyong 9ea1185649 * Finish task#60378. 2022-07-12 09:10:05 +00:00
chaideqing 3532e82841 * fix card show blank above header 2022-07-11 15:29:26 +08:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
tianshujie 6792048cfc * Fix bug #24802. 2022-07-08 11:08:40 +08:00
孙广明 c540e7002d Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555

See merge request easycorp/zentaopms!4392
2022-07-07 02:51:51 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
王怡栋 5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.

See merge request easycorp/zentaopms!4395
2022-07-07 01:49:35 +00:00
liumengyi 59bbb4577a * Finish task #59482. 2022-07-07 09:44:33 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
liumengyi 73fe07dd49 * Finish task #59482. 2022-07-06 16:18:44 +08:00
tianshujie 4aaaa2be85 * Finish task #59476. 2022-07-06 15:56:48 +08:00