Commit Graph
15798 Commits
Author SHA1 Message Date
jinianlan e2a7da40af * finish task #5103,6102 2019-07-16 08:29:38 +08:00
jinianlan c383da7a8c * finish task #6097,#6103,#6108,#6100 2019-07-15 17:07:26 +08:00
jinianlan 600a4fd8c1 * finish task #6088 2019-07-15 14:47:17 +08:00
jinianlan 8dc80beb9f * finish task #6088 2019-07-15 14:44:18 +08:00
jinianlan 1a508d3a97 * finish task #6096 2019-07-15 14:23:39 +08:00
jinianlan f047de96cb * finish task #6105 2019-07-15 13:59:50 +08:00
wangyidong 136e68e3dc + add de css. 2019-07-12 17:24:42 +08:00
wangyidong 760a4cde76 * fix bug #1837. zentaopms_11.6.stable_20190712 2019-07-12 17:08:13 +08:00
wangyidong e40bb305df * adjust for upgrade. 2019-07-12 16:50:07 +08:00
wangyidong a621ff9037 * add new version and upgrade. 2019-07-12 16:44:30 +08:00
wyd621 55e6dd5888 Merge pull request #33 from easysoft/11.5
11.5
2019-07-12 15:55:35 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong b65e00d0f8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 15:23:42 +08:00
wangyidong e71d8fa75f * fix bug for select table. 2019-07-12 15:23:14 +08:00
Catouse c6e8ef42ad * update zui. 2019-07-12 14:54:53 +08:00
wangyidong 0722210180 * code for task #5997. 2019-07-12 14:49:19 +08:00
wangyidong c51eac4776 * finish task #5997. 2019-07-12 14:44:39 +08:00
wangyidong 48b2ba9825 * finish task #5993. 2019-07-12 14:42:16 +08:00
wangyidong 05bb51f830 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 14:40:30 +08:00
wangyidong 2f3bf3f63a * finish task #5992. 2019-07-12 14:39:02 +08:00
wangyidong 1c87bcf7b6 * adjust for report. 2019-07-12 14:23:09 +08:00
reneeteng 743edff885 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 14:16:33 +08:00
reneeteng e80eed1007 * Lang file update. 2019-07-12 14:15:54 +08:00
Catouse 43e58d64a6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 13:27:08 +08:00
Catouse a1ebc953e8 * update zui. 2019-07-12 13:26:05 +08:00
wangyidong 068a38a9c4 * finish task #5960. 2019-07-12 13:25:15 +08:00
reneeteng 56666d927f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 13:21:11 +08:00
reneeteng f85d506938 * Lang file update. 2019-07-12 13:19:30 +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 be23395e4e Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 10:27:09 +08:00
wangyidong eaf02b97ce * adjust for mailto. 2019-07-12 10:26:13 +08:00
Catouse 318a73e989 * update kindeditor. 2019-07-12 10:13:51 +08:00
Catouse 77f6dca0ef Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-12 10:07:17 +08:00
Catouse 5e5ac2c12b * update kindeditor. 2019-07-12 10:07:04 +08:00
wangyidong d27f5a513a + add Deutsch lang. 2019-07-12 09:58:14 +08:00
wangyidong 983d77b58d * add Deutsch lang. 2019-07-12 09:57:15 +08:00
wangyidong ca6b89220b Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 09:56:19 +08:00
wangyidong 081d21302a * finish task #6048. 2019-07-12 09:55:44 +08:00
wangyidong 45448fdd69 * finish task #5944. 2019-07-12 09:54:29 +08:00
Catouse 7bcbb43707 * update zui. 2019-07-12 09:39:08 +08:00
wangyidong 89b338947a Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 09:34:59 +08:00
wangyidong b0fafc0ba1 * finish task #6044. 2019-07-12 09:34:18 +08:00
jinianlan 29fe42ca80 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-12 09:20:49 +08:00
jinianlan 1c5352888f * finish task #5934 2019-07-12 09:19:01 +08:00
wangyidong 959d82222f * finish task #5992. 2019-07-12 09:03:00 +08:00
wangyidong 5bf20a96ff * finish task #5993. 2019-07-12 08:59:45 +08:00
wangyidong 8c8bd5acee * finish task #5994. 2019-07-12 08:54:10 +08:00
wangyidong f577da645d * finish task #6053. 2019-07-12 08:23:27 +08:00
wangyidong 7234603458 * finish task #5569. 2019-07-11 17:14:19 +08:00