Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
16,442 Commits 2 Branches 292 Tags
e6486f6c19a15ed2c4629088a75fa5a3aa3b0efe
Commit Graph
1849 Commits
Author SHA1 Message Date
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
liugang 5e32ee1081 * Add subStatus in lang files. 
* Change sub status when status is changed and sub status is not set, and record the changes.
 2019-07-30 10:10:10 +08:00
Yagami 8d26d61fb1 * Finish task #6162. 2019-07-29 16:53:48 +08:00
wangyidong 6b3c34dba2 * finish task #6160. 2019-07-29 16:30:55 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong 5ace83db9a * adjust for sendmail. 2019-07-26 17:48:52 +08:00
wangyidong 9b2174e001 * adjust for code style. 2019-07-26 15:48:56 +08:00
jinianlan aac0ce2554 * fix Bug #2656,#2653 2019-07-25 17:57:15 +08:00
wangyidong f1b0faf11b * adjust sortable file. 2019-07-24 09:35:40 +08:00
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan 0672bc7a0b * finish task #2656 2019-07-23 14:06:31 +08:00
wangyidong b17d7c2999 * add checkeEnLang method. 2019-07-19 11:34:38 +08:00
wangyidong 169a0fa5fb * adjust for import js/css with js::import/css::import. 2019-07-18 16:51:01 +08:00
wangyidong eb51c0fda2 * change for zh-tw lang. 2019-07-16 13:39:35 +08:00
wangyidong 853fbbd18e * adjust for aiux link. 2019-07-16 12:00:25 +08:00
wangyidong 37bda2cb51 * finish task #6091. 2019-07-15 16:00:41 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong 56dfe5030d * finish task #6084. 2019-07-15 13:37:59 +08:00
wangyidong a621ff9037 * add new version and upgrade. 2019-07-12 16:44:30 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong e71d8fa75f * fix bug for select table. 2019-07-12 15:23:14 +08:00
reneeteng e80eed1007 * Lang file update. 2019-07-12 14:15:54 +08:00
reneeteng 56666d927f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 13:21:11 +08:00