Commit Graph
821 Commits
Author SHA1 Message Date
wangyidong 1ab959e731 * finish task #6336. 2019-09-04 17:27:45 +08:00
wangyidong f7841fd604 * code for task #6300. 2019-09-03 11:21:29 +08:00
wangyidong 5e29f3bde5 * code for task #6300. 2019-09-03 11:13:41 +08:00
Yagami f7efb2c554 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-09-03 10:19:44 +08:00
Yagami 280ca6be64 * Finish task #6300. 2019-09-03 10:19:28 +08:00
wangyidong 6ac14da5d1 * finish task #6297. 2019-09-03 10:15:20 +08:00
wangyidong 296d9ebc11 * code for task #6239. 2019-08-22 13:46:32 +08:00
wangyidong 6b9b77fd4e * finish task #6239. 2019-08-22 13:33:01 +08:00
wangyidong 20fbf627ea * code for task #6238. 2019-08-22 11:13:08 +08:00
jinianlan aa1609117e Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-21 10:27:32 +08:00
jinianlan f1ef72dfbb * code for task 6244,6242. 2019-08-21 10:25:32 +08:00
wangyidong f1684ad8e9 * finish task #6241. 2019-08-21 10:15:58 +08:00
wangyidong 68f4606648 * adjust for task #6174. 2019-08-15 11:14:27 +08:00
wangyidong 9b6207141c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 10:39:24 +08:00
wangyidong 72cd70ad88 * finish task #6213. 2019-08-12 10:39:00 +08:00
jinianlan c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +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
Yagami c06773e491 * Finish task #6156. 2019-07-30 09:03:09 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong a1bf91fb7b * cache file read image. 2019-07-23 13:45:54 +08:00
wangyidong 7337f28144 * fix bug. 2019-07-22 15:37:52 +08:00
wangyidong 169a0fa5fb * adjust for import js/css with js::import/css::import. 2019-07-18 16:51:01 +08:00
wangyidong 0f82741d36 * fix bug for check project lib priv. 2019-07-16 15:30:30 +08:00
wangyidong eb51c0fda2 * change for zh-tw lang. 2019-07-16 13:39:35 +08:00
wangyidong ae935b46b1 * finish task #5965. 2019-07-15 16:29:32 +08:00
wangyidong 141d5c1f8c * finish task #6094. 2019-07-15 16:18:53 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong a621ff9037 * add new version and upgrade. 2019-07-12 16:44:30 +08:00
wangyidong d27f5a513a + add Deutsch lang. 2019-07-12 09:58:14 +08:00
wangyidong f578ad80e7 * finish task #5992. 2019-07-11 15:07:14 +08:00
wangyidong 549828eaca * finish task #5950. 2019-07-10 16:09:11 +08:00
wangyidong 4e85182b8f * finish task #5959. 2019-07-10 14:38:38 +08:00
wangyidong 833e8b75ae * finish task #5962. 2019-07-10 14:01:52 +08:00
wangyidong 2277a17ee6 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-10 13:51:59 +08:00
wangyidong 81b6a7036f * finish task #5965. 2019-07-10 13:51:27 +08:00
jinianlan 60e7014ef7 * finish task #6020,#6009,#6007,#5949 2019-07-10 13:41:13 +08:00
wangyidong 23922ac917 * finish task #5993. 2019-07-10 12:15:19 +08:00
jinianlan 13ae00955c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 16:33:31 +08:00
jinianlan 23d5f2bd3e * finish task #6021,#6009,#6007,#6006 2019-07-08 15:05:26 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +08:00
reneeteng a3e86de815 * Lang file update. 2019-07-08 10:48:13 +08:00
wangyidong d9b43a8c5e * finish task #6033. 2019-07-05 11:09:08 +08:00
wangyidong 9910fa461c * finish task #6034. 2019-07-05 10:52:30 +08:00
Yagami e481cba1e7 * Fix css file. 2019-07-01 15:35:19 +08:00
wangyidong dcac58b007 * revert dynamicAction lang. 2019-06-13 14:11:56 +08:00
wangyidong f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
reneeteng d4b7a9ac4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-11 11:16:22 +08:00
reneeteng 520d121bdf * Lang file optimized. 2019-06-11 09:53:11 +08:00
wangyidong 3b54364860 * code for task #5673. 2019-06-11 08:20:49 +08:00