Commit Graph
757 Commits
Author SHA1 Message Date
Yagami 4e502a8df0 * Fix testcase create error and project story lang. 2020-11-26 09:21:25 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
hufangzhou db13a97dc1 * Finish task#8417. 2020-11-18 09:20:24 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123 bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
z 3e28b36de7 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-12 17:21:38 +08:00
holan20180123 3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123 4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +08:00
z 70335707c8 * finish task #2669. 2020-11-12 11:31:03 +08:00
holan20180123 159cd5c41d * Finish task #8194. 2020-11-10 10:34:08 +08:00
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
holan20180123 43089f346b * Finish task #8235. 2020-11-03 14:58:17 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
holan20180123 6b2a0ff721 * Finish task #8021. Fix bug #2550. 2020-09-21 16:59:42 +08:00
holan20180123 b92156a283 * Finish task #8021. Fix bug #2550. 2020-09-21 16:56:01 +08:00
qiyu-xie fa2690d046 *Fix bug view and testcase view product jump issues. 2020-09-04 09:56:37 +08:00
qiyu-xie e7c8de3964 * Fix bug #3342. 2020-09-04 09:14:46 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie 03c00910ae Fix bug #3342 2020-08-14 08:10:19 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 ac56db1998 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:51:15 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
z 9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
z e9cfd48d18 * adjust for refreshPage and set closed for member. 2020-07-27 13:28:33 +08:00
holan20180123 657620244b * Finish task #7515,7516,7517,7518,7524,7525,7526. 2020-07-25 11:59:55 +08:00
z 96980aee50 * adjust for canSearch flow field. 2020-07-22 17:06:16 +08:00
holan20180123 edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00
holan20180123 f574524f3f * Finish task #7407. 2020-07-17 17:19:12 +08:00
chenfei 2034b6ff8f * Fix bug #2988. 2020-07-08 14:40:24 +08:00
sgm0422 ec7511df35 * Merge showimport to 15.x. 2020-07-02 14:32:05 +08:00
z 807fa3c58a * finish task #7273. 2020-06-22 10:59:10 +08:00
z cb8d7502b7 * finish task #7263. 2020-06-17 13:03:15 +08:00
z c613235081 * fix bug #2542. 2020-06-16 14:32:57 +08:00
sgm0422 09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
wangyidong af6a2f26bc * code for batchcreate and batchedit with flow. 2020-05-29 13:45:41 +08:00
wangyidong 91de6e934c * add insert param for cover or insert exist data. 2020-05-29 10:08:11 +08:00
zhaohaibo d4b09b733d add param currentProgram 2020-05-27 13:26:08 +08:00
wangyidong b85560356e * fix for error. 2020-05-15 08:21:18 +08:00
wangyidong e1dd1b8d1f * change importFile to fileImport. 2020-05-13 17:39:17 +08:00
wangyidong d81da2876b * finish task #7180. 2020-05-13 17:22:01 +08:00
wangyidong 4ee81aa33e * code for task #7195. 2020-05-13 14:10:10 +08:00
wangyidong 0afd583d8f * finish task #7195. 2020-05-13 14:07:20 +08:00
wangyidong 5ea2467bee * finish task #7088. 2020-05-06 10:38:09 +08:00
wangyidong 7407085500 * adjust for show import. 2020-04-26 17:33:42 +08:00
wangyidong fc5de2944e * fix bug #3099. 2020-04-23 14:47:32 +08:00
wangyidong 54cb29a788 * adjust for highlight and add story reg. 2020-04-08 10:39:28 +08:00