Commit Graph
1804 Commits
Author SHA1 Message Date
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
wangyidong 0bc93a387f * finish task #5929. 2019-07-12 11:15:23 +08:00
wangyidong 49d3fce657 * code task #5569. 2019-07-12 10:29:44 +08:00
wangyidong d27f5a513a + add Deutsch lang. 2019-07-12 09:58:14 +08:00
wangyidong 7234603458 * finish task #5569. 2019-07-11 17:14:19 +08:00
Catouse 26643f3b79 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-11 14:29:40 +08:00
Catouse 22de5cc42c * fix orders incorrect. 2019-07-11 14:29:33 +08:00
wangyidong f47be36c0c * finish task #6017. 2019-07-11 13:41:06 +08:00
wangyidong 07f976db1a * finish task #5939. 2019-07-10 17:28:58 +08:00
jinianlan 673656fe47 * finish task #5953 2019-07-10 16:19:09 +08:00
reneeteng 2f203d6985 * Lang file update. 2019-07-10 16:02:55 +08:00
jinianlan 60e7014ef7 * finish task #6020,#6009,#6007,#5949 2019-07-10 13:41:13 +08:00
wangyidong 014c61e4e6 * finish task #5969. 2019-07-10 13:04:12 +08:00
reneeteng 4fc6ae4314 * Lang file update. 2019-07-09 16:45:18 +08:00
reneeteng c04441a40d * Lang file update. 2019-07-08 14:37:09 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +08:00
liugang d8d90d83f3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 10:16:25 +08:00
liugang 2267a99a65 * Add default error lang for url. 2019-07-08 10:15:48 +08:00
reneeteng 9d624513e4 * Lang file update. 2019-07-05 18:05:13 +08:00
reneeteng af8ff0b270 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-05 16:30:16 +08:00
reneeteng c1f342e0bb * Lang file update for proj. 2019-07-05 16:28:38 +08:00
wangyidong dc87304782 * finish task #6025. 2019-07-05 15:35:13 +08:00
wangyidong 870b549175 * finish task #6029. 2019-07-05 11:22:26 +08:00
wangyidong e3da7312f2 * finish task #6035. 2019-07-05 10:23:08 +08:00
wangyidong ea1c011786 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-04 13:41:59 +08:00
wangyidong 402bda7579 * finish task #6055. 2019-07-04 13:40:37 +08:00
reneeteng 9a0698b347 * Lang optimized. 2019-07-04 10:12:43 +08:00
Yagami 49eddc115c * Finish task #5924. 2019-07-03 08:57:32 +08:00
wangyidong e8460026fa * adjust en lang for translate. 2019-07-01 17:48:47 +08:00
Yagami b6eef9472d * Fix table position. 2019-07-01 17:23:09 +08:00
chenfei 70449c2b83 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-01 16:22:29 +08:00
chenfei 141346bd52 * remove editor module. 2019-07-01 16:19:38 +08:00
Yagami f3fe328188 * Finish task #5914. 2019-07-01 16:15:52 +08:00
Yagami 7766afbc2d * Finish task #5865. 2019-06-27 14:44:01 +08:00
Yagami 50b7ac7516 * Add code for 11.5.2. 2019-06-26 17:37:06 +08:00
Yagami 09ae1056ea * Fix code for user module. 2019-06-26 17:24:41 +08:00
Yagami 910ea1e96f * Fix details before release. 2019-06-25 09:33:56 +08:00
Yagami 2d73bfdd7d * Fix checkentry method. 2019-06-24 17:31:55 +08:00
wangyidong 005e845118 * finish task #5829,5828,5826,5825. 2019-06-24 09:49:04 +08:00
Yagami 7b41c11c32 * Finish task #5804. 2019-06-21 14:08:23 +08:00
Yagami 771a81bc5e * Fix menu. 2019-06-19 10:55:33 +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
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