Commit Graph
1404 Commits
Author SHA1 Message Date
leiyong 81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
holan20180123 bbf7424e40 * Finish task #8089. 2020-09-30 14:07:33 +08:00
tianshujie98 d305a513be * Fix bug #3508. 2020-09-27 09:47:29 +08:00
qiyu-xie 6829e5236f * Fix bug#3516. 2020-09-25 14:32:18 +08:00
qiyu-xie cdf36a7d01 * Fix bug#3516. 2020-09-25 14:22:54 +08:00
z 2cc520cff7 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-09-23 15:09:36 +08:00
z 3fa53be319 * code for task #7939. 2020-09-23 15:05:45 +08:00
holan20180123 d85d370800 * Finish task #7932. Fix bug #3422. 2020-09-23 13:27:08 +08:00
holan20180123 b92156a283 * Finish task #8021. Fix bug #2550. 2020-09-21 16:56:01 +08:00
holan20180123 08c1428b30 * Fix bug #7914. 2020-09-15 17:20:19 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
tianshujie98 65347ec6b3 * Fix bug #3442. 2020-09-08 17:30:05 +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
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