Commit Graph
12749 Commits
Author SHA1 Message Date
reneeteng 7c56ccda6c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-19 11:14:46 +08:00
reneeteng 482e49c21a * Lang file update. 2019-06-19 11:14:11 +08:00
reneeteng 14ce4572e5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-19 11:05:48 +08:00
Yagami 771a81bc5e * Fix menu. 2019-06-19 10:55:33 +08:00
Yagami f0e6ad5643 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-18 18:00:34 +08:00
Yagami 5c83f0e085 * Add for trainpost. 2019-06-18 18:00:12 +08:00
wangyidong 10ca8bf0e0 * finish task #5824. 2019-06-18 11:10:07 +08:00
wangyidong f43dc5c082 * adjust for bug. 2019-06-17 09:46:27 +08:00
reneeteng f813cda32e * Lang file update. 2019-06-14 15:38:54 +08:00
wangyidong 811d68443c * adjust for style. 2019-06-14 11:18:18 +08:00
wangyidong dcac58b007 * revert dynamicAction lang. 2019-06-13 14:11:56 +08:00
wangyidong a439ef9a26 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-12 13:15:09 +08:00
wangyidong f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
reneeteng 22ab119017 * Lang file update. 2019-06-11 16:26:22 +08:00
reneeteng f48d62a430 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-11 15:06:45 +08:00
reneeteng 2146affb82 * Lang file update. 2019-06-11 15:06:27 +08:00
wangyidong fa412abc6a * adjust for style. 2019-06-11 13:24:19 +08:00
wangyidong 0594c430ed Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-11 13:13:39 +08:00
reneeteng 80fe80c41c * Change module lang file. 2019-06-11 13:09:45 +08:00
reneeteng 04c138ba06 * Lang file update. 2019-06-11 11:30:44 +08:00
reneeteng e5e51fa82f + add en lang. 2019-06-11 11:29:50 +08:00
reneeteng d4b7a9ac4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-11 11:16:22 +08:00
wangyidong 96d2cdca60 * adjust for style. 2019-06-11 10:04:25 +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
reneeteng 307a19cb0a * Lang file update. 2019-06-10 17:34:41 +08:00
reneeteng 31f6ccb02c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-10 16:14:32 +08:00
reneeteng ca5cf5f905 * Lang file update. 2019-06-10 16:14:13 +08:00
wangyidong 4ecd2b4373 * code for task #5717. 2019-06-10 13:21:26 +08:00
wangyidong 16d810d460 * code for task #5713. 2019-06-10 11:17:19 +08:00
wangyidong 293ef1bef7 * code for task #5706. 2019-06-10 11:14:24 +08:00
wangyidong 23084f2a16 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-10 11:12:19 +08:00
wangyidong 7f2f6748e3 * code task #5667. 2019-06-10 11:11:53 +08:00
reneeteng 718111bbb8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-10 10:46:45 +08:00
reneeteng 01cf64b4d9 * Lang file update. 2019-06-10 10:46:22 +08:00
wangyidong 1251039735 * code for task # 2019-06-10 09:21:09 +08:00
wangyidong 20ebda13e2 * code for task #5627. 2019-06-10 09:18:21 +08:00
wangyidong d71a5c685e Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-10 09:10:16 +08:00
wangyidong 141cd4dce3 * finish task #5801. 2019-06-10 09:09:28 +08:00
reneeteng 5ea8134459 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-06 16:28:25 +08:00
reneeteng 3c7a49d6a9 * Lang file update. 2019-06-06 16:28:00 +08:00
wangyidong 8438decfc6 * finish task #5640. 2019-06-06 16:17:19 +08:00
wangyidong 0e7bd0522e * finish task #5641. 2019-06-06 16:03:26 +08:00
wangyidong febe820a1a Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-06 15:15:01 +08:00
wangyidong c3f0fd4714 * finish task #5628. 2019-06-06 15:14:36 +08:00
reneeteng c9074b43a9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-06 14:29:10 +08:00
reneeteng a990d767f7 * Action langu update. 2019-06-06 14:28:46 +08:00
wangyidong 75d5b18f20 * finish task #5659. 2019-06-06 13:24:20 +08:00
wangyidong 1756eb5daa * finish task #5686. 2019-06-06 13:06:08 +08:00
wangyidong a96eae5c3e Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-06 11:21:27 +08:00