Commit Graph
16396 Commits
Author SHA1 Message Date
reneeteng d7144680fc * Lang bug fixed. 2019-10-22 08:56:32 +08:00
liugang edcb54fbe4 * The workflow function support batch operate. 2019-10-17 15:14:44 +08:00
wangyidong a5316c5667 * adjust paperwork. zentaopms_11.6.4_20191017 2019-10-17 10:29:41 +08:00
wangyidong 4f3eb17120 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-17 10:15:51 +08:00
wangyidong 20a1c5b375 * add CHANGELOG and change de fr zh-tw lang. 2019-10-17 10:14:57 +08:00
Yagami cfbb1c1108 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-17 10:05:55 +08:00
Yagami 26be63f937 * Finish code form #6408. 2019-10-17 10:03:31 +08:00
wangyidong 51919ca195 * add new version and upgrade. 2019-10-17 08:50:39 +08:00
wangyidong 6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +08:00
wangyidong 172964e9bf Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-16 17:18:41 +08:00
wangyidong cf3c318d07 * adjust for find questions. 2019-10-16 17:14:40 +08:00
Yagami 499964122e * Code for task #1493. 2019-10-16 16:17:49 +08:00
Yagami 36f688908b * Code for task #6394. 2019-10-16 15:40:41 +08:00
Yagami 40fd784524 * Code for task #6394. 2019-10-16 15:37:14 +08:00
Yagami ac5b592e1f * Reset productblock. 2019-10-16 15:01:10 +08:00
wangyidong 8ef5ab336c * code for task #6421. 2019-10-16 13:12:58 +08:00
wangyidong e3845c1032 * finish task #6421. 2019-10-16 13:11:45 +08:00
wangyidong 1142a5a52a * finish task #6426. 2019-10-16 10:16:50 +08:00
wangyidong 56ae0ded09 * finish task #6401. 2019-10-15 17:22:55 +08:00
wangyidong 2487b42049 * finish task #6407. 2019-10-15 16:44:27 +08:00
wangyidong 4e520da611 * adjust for task #6430. 2019-10-15 16:19:38 +08:00
wangyidong 82ab8ddc1e Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-15 16:18:35 +08:00
wangyidong 1bbf58412a * finish task #6455. 2019-10-15 16:17:44 +08:00
Yagami 63cd3978ea * Modify .htaccess to prohibit directory browsing. 2019-10-15 14:16:02 +08:00
Yagami fbae55624b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-15 13:40:35 +08:00
Yagami ea3fe5000e * Finish task #6464. 2019-10-15 13:40:08 +08:00
wangyidong 0ae2cc74cd Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-15 11:25:14 +08:00
wangyidong 1e3564a250 * finish task #6409. 2019-10-15 11:24:50 +08:00
wangyidong f522a79633 * change for CSRF. 2019-10-15 11:23:31 +08:00
Yagami ad14136ea7 * Finish task #6424. 2019-10-15 11:09:43 +08:00
Yagami 74410cbc5a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-15 10:53:28 +08:00
Yagami 7bb1662f9e * Code for task #6424. 2019-10-15 10:52:57 +08:00
wangyidong 1928b036e4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-14 17:34:43 +08:00
wangyidong ee1afb43ed * code for task #6411. 2019-10-14 17:33:52 +08:00
Catouse 033e031ede Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-14 17:01:34 +08:00
Catouse 6282d8c6dd * format code. 2019-10-14 17:01:18 +08:00
Catouse 496d059ed7 * finish task #6423, fix bug #2727. 2019-10-14 17:00:48 +08:00
wangyidong 4574c12dc3 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-14 16:24:27 +08:00
wangyidong 4ce472b509 * finish task #6414. 2019-10-14 16:22:35 +08:00
Yagami d383adbb8b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-14 15:57:01 +08:00
Yagami 697a1122ba * Code for task #6410. 2019-10-14 15:55:30 +08:00
wangyidong 33f5465b54 * finish task #6416. 2019-10-14 15:43:58 +08:00
wangyidong 42bcf59a23 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-14 15:25:36 +08:00
wangyidong d6dc09c08a * finish task #6418. 2019-10-14 15:25:14 +08:00
Yagami e408817726 * Finish task #6420. 2019-10-14 15:07:41 +08:00
Yagami 86c5222d36 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-14 14:40:20 +08:00
Yagami 31af090d1e * Finish task #6410. 2019-10-14 14:39:56 +08:00
wangyidong 2be845e3ba Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-14 14:27:09 +08:00
wangyidong caec432f48 * finish task #6419. 2019-10-14 14:26:37 +08:00
Yagami 8286a06841 * Finish task #6440. 2019-10-14 14:04:42 +08:00