Commit Graph
1883 Commits
Author SHA1 Message Date
wangyidong 7af8e82c0d * code for upgrade. 2020-01-02 09:45:21 +08:00
wangyidong 56aee06518 * change QA to Test. 2019-12-31 15:32:07 +08:00
wangyidong cb60f926d9 * adjust code. 2019-12-25 17:35:52 +08:00
wangyidong 3bd354fa8d * code other lang. 2019-12-25 15:52:42 +08:00
wangyidong 9a30b4a9d4 * add priv for annualData. 2019-12-25 10:36:32 +08:00
wangyidong 5eb7f1c04c * finish task #6769,6768. 2019-12-25 09:33:40 +08:00
Catouse 4517f9f4fd * fix cannot select text in kindeditor in ie11, task #6671, bug #2888. 2019-12-17 14:37:38 +08:00
Catouse 4ea90b2f0d * add ja language to zui and kindeditor. 2019-12-17 09:34:42 +08:00
Catouse b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong b68c0ace0f * finihsh task #6669. 2019-12-12 08:59:19 +08:00
wangyidong ddddf58813 * finish task #6673. 2019-12-11 16:07:49 +08:00
chenfei 125e2375f8 * Adjust variable name. 2019-12-11 11:15:00 +08:00
wangyidong 52460dd80d * code for task #6708. 2019-12-10 15:45:06 +08:00
wangyidong 6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
wangyidong 168ce93203 * finish task #6620. 2019-12-05 17:00:08 +08:00
wangyidong 36c1a6d2c4 * finish task #6647. 2019-12-04 16:10:06 +08:00
wangyidong d4b9ccbab8 * finish task #6606. 2019-12-02 17:05:26 +08:00
wangyidong ecbf8220da * add new version and upgrade. 2019-11-28 09:29:36 +08:00
Yagami 383a2e236b * Finish task #6579. 2019-11-27 10:05:25 +08:00
wangyidong 4988680449 * finish task #6577. 2019-11-26 13:49:20 +08:00
wangyidong 90122b67b9 * adjust code. 2019-11-26 11:03:45 +08:00
Catouse 5b02546da1 Revert "* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787."
This reverts commit f98ea2c6de.

# Conflicts:
#	www/js/jquery/lib.js
2019-11-25 16:37:57 +08:00
wangyidong 41c693d07a * finish task #6488. 2019-11-22 10:37:50 +08:00
Catouse f98ea2c6de * upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787. 2019-11-21 16:15:44 +08:00
wangyidong c0ab373ce7 * code for task #6566. 2019-11-21 13:57:49 +08:00
wangyidong 485fdde5e0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 13:16:41 +08:00
Yagami 7166433796 * Fix task #6489. 2019-11-21 13:15:08 +08:00
wangyidong 006513e56f * finish task #6566. 2019-11-21 13:15:06 +08:00
Yagami 97a65c43a7 * Finish task #6489. 2019-11-21 09:13:31 +08:00
Yagami e85b63ec85 * Finish task #6541. 2019-11-19 14:36:19 +08:00
wangyidong 7d26078e3d Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-18 14:15:10 +08:00
wangyidong 6434e06342 * finish task #6539,6537. 2019-11-18 14:14:03 +08:00
guanxiying c1942d154a * Fix story menu. 2019-11-18 13:18:00 +08:00
guanxiying 58357af226 * Finish task #6549. 2019-11-18 13:06:50 +08:00
Yagami 8c75ca4b2d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-14 10:45:10 +08:00
Yagami 6a34209544 * Finish task #6481. 2019-11-14 10:44:43 +08:00
Catouse 81a8539a36 * add ja language data to kindeditor. 2019-11-05 17:18:56 +08:00
wangyidong 20a1c5b375 * add CHANGELOG and change de fr zh-tw lang. 2019-10-17 10:14:57 +08:00
wangyidong 6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +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
wangyidong 2f62ecb51e * finish task #6444. 2019-10-12 14:50:00 +08:00
Yagami e0a667b5f8 * Finish task #6405. 2019-10-11 14:20:22 +08:00
Yagami 1821853a9f * Finish task #6384. 2019-10-09 10:00:16 +08:00
wangyidong 54eaa0d545 * check timestamp for check entry token. 2019-09-25 15:00:08 +08:00
wangyidong 3d2623aa2d * add new version and upgrade it. 2019-09-05 13:06:15 +08:00
wangyidong e841301ad5 * fix bug #2723. 2019-09-04 16:00:01 +08:00
Catouse f90da50eb7 * fix bug #2608, task #6318, call convertURL immediately to kill bug. 2019-09-03 17:33:22 +08:00
wangyidong b72f3f5db3 * code for tutorial. 2019-09-03 14:31:48 +08:00
wangyidong 981d69a87e * code for task #6310. 2019-09-03 13:18:55 +08:00