Commit Graph
1389 Commits
Author SHA1 Message Date
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
z ba32604be6 * fix for flow. 2020-08-31 15:17:40 +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
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
z ae84a5dc24 * code for task #7600. 2020-08-05 16:33:57 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +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
z 21fcb26e30 * adjust for create from import. 2020-07-22 09:05:05 +08:00
holan20180123 edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00
holan20180123 3cba60eb57 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-17 17:19:47 +08:00
holan20180123 f574524f3f * Finish task #7407. 2020-07-17 17:19:12 +08:00
tianshujie98 a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
leiyong 0dddf6deda * Finish task#7346. 2020-07-14 02:02:13 -07:00
holan20180123 bbaf3c038e * Finish task #7406. 2020-07-14 16:23:14 +08:00
chenfei 2034b6ff8f * Fix bug #2988. 2020-07-08 14:40:24 +08:00
chenfei 48e1b9becc * Fix bug #3217. 2020-07-06 15:20:59 +08:00
z 9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
z 36dfb8eb36 * adjust code. 2020-07-01 17:47:54 +08:00
z 3a391ea836 * finish task #7277. 2020-06-22 14:30:52 +08:00
z 807fa3c58a * finish task #7273. 2020-06-22 10:59:10 +08:00
z d05924db17 * finish task #7279. 2020-06-19 15:01:22 +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
z 2539193d30 * add new version and upgrade. 2020-06-01 14:58:04 +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
wangyidong b85560356e * fix for error. 2020-05-15 08:21:18 +08:00
wangyidong 15b2d838e7 * finish task #7187. 2020-05-14 08:29:21 +08:00
wangyidong e1dd1b8d1f * change importFile to fileImport. 2020-05-13 17:39:17 +08:00
wangyidong be2033a859 * finish task #7183. 2020-05-13 17:29:27 +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 1e5576a961 * fix bug. 2020-04-30 11:21:29 +08:00
wangyidong c92500975c * finish task #7071. 2020-04-27 13:42:01 +08:00
wangyidong e0b54c87ef * fix bug for search testcase. 2020-04-27 11:13:03 +08:00
wangyidong 7407085500 * adjust for show import. 2020-04-26 17:33:42 +08:00
wangyidong 1e54605dcc * fix bug #3109. 2020-04-24 16:30:26 +08:00
wangyidong fc5de2944e * fix bug #3099. 2020-04-23 14:47:32 +08:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
wangyidong 74bd767a6e * adjust for en and zh-tw lang. 2020-04-08 14:36:37 +08:00
wangyidong 54cb29a788 * adjust for highlight and add story reg. 2020-04-08 10:39:28 +08:00
wangyidong 08d40394b8 * adjust for onlyTest flow. 2020-04-08 10:06:47 +08:00