Commit Graph
13034 Commits
Author SHA1 Message Date
wangyidong eb51c0fda2 * change for zh-tw lang. 2019-07-16 13:39:35 +08:00
wangyidong f6411e0aeb * fix bug for page style. 2019-07-16 13:20:35 +08:00
wangyidong 69578d0e49 * finish task #6083. 2019-07-16 12:07:17 +08:00
wangyidong c242294d4e Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 12:03:50 +08:00
wangyidong 34a0fa9d7f * adjust for editor and translate. 2019-07-16 12:01:53 +08:00
wangyidong 853fbbd18e * adjust for aiux link. 2019-07-16 12:00:25 +08:00
jinianlan ea8e12fa28 * fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096 2019-07-16 11:07:23 +08:00
jinianlan 4150fceb21 * fix task #6108 2019-07-16 09:11:07 +08:00
jinianlan f26fb45064 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 08:51:59 +08:00
jinianlan e2a7da40af * finish task #5103,6102 2019-07-16 08:29:38 +08:00
wangyidong cb87a2b0cf * finish task #6087. 2019-07-15 17:10:52 +08:00
jinianlan c383da7a8c * finish task #6097,#6103,#6108,#6100 2019-07-15 17:07:26 +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 f0be1fb448 * finish task #6093. 2019-07-15 16:11:46 +08:00
wangyidong 20a984becc * finish task #6092. 2019-07-15 16:06:37 +08:00
wangyidong de4447829c Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-15 16:01:26 +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
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
reneeteng 0fc983d890 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-15 14:43:13 +08:00
reneeteng 8507b22977 * Lang file update. 2019-07-15 14:42:36 +08:00
reneeteng 89f9507638 * Lang file optimized. 2019-07-15 14:38:58 +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 29a97a4f1c * finish task #6085. 2019-07-15 13:41:14 +08:00
wangyidong 56dfe5030d * finish task #6084. 2019-07-15 13:37:59 +08:00
wangyidong c05813c0d9 * change for task #6082. 2019-07-15 13:20:59 +08:00
reneeteng afad39685f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-15 09:12:33 +08:00
reneeteng 4f3b6de567 * Lang file update. 2019-07-15 09:10:29 +08:00
wangyidong 760a4cde76 * fix bug #1837. 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 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
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
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 eaf02b97ce * adjust for mailto. 2019-07-12 10:26:13 +08:00