Commit Graph

1871 Commits

Author SHA1 Message Date
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
wangyidong
2b78f53283 * finish task #6310. 2019-09-03 13:17:45 +08:00
wangyidong
e7cc784534 * finish task #6281,6282. 2019-08-29 10:57:40 +08:00
wangyidong
20fbf627ea * code for task #6238. 2019-08-22 11:13:08 +08:00
wangyidong
010e585550 * finish task #6176. 2019-08-14 08:59:39 +08:00
liugang
506aaa3d74 * Change sub status when status is changed and sub status is not set, and record the changes. 2019-08-06 18:05:31 +08:00
liugang
cd0e4ee3fe * Adjust lang files. 2019-08-06 14:35:43 +08:00
jinianlan
8794e9c8df Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-06 10:46:12 +08:00
jinianlan
b03634638a * fix Bug #2679,#2637,#2590,finish task #6172,#6182 2019-08-06 10:40:22 +08:00
wangyidong
922800cb81 * change for task #8445. 2019-08-02 13:40:13 +08:00
jinianlan
15c6c30ee4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-31 08:55:54 +08:00
jinianlan
7e26346313 * finish task #6155,#6151,#6147,#6144 2019-07-31 08:54:16 +08:00
liugang
9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00