Commit Graph
15846 Commits
Author SHA1 Message Date
jinianlan 0672bc7a0b * finish task #2656 2019-07-23 14:06:31 +08:00
jinianlan ed834881b8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-23 14:05:49 +08:00
wangyidong a1bf91fb7b * cache file read image. 2019-07-23 13:45:54 +08:00
jinianlan fbf7a7f073 * finish task #2651,#2642 2019-07-23 09:46:54 +08:00
wangyidong 7337f28144 * fix bug. 2019-07-22 15:37:52 +08:00
wangyidong aee1a01e28 * adjust for build lang file. 2019-07-22 08:55:24 +08:00
wangyidong 898fef566f * fix translate model. 2019-07-19 11:49:21 +08:00
wangyidong 169a0fa5fb * adjust for import js/css with js::import/css::import. 2019-07-18 16:51:01 +08:00
wangyidong a0dfd4985c * fix for alert noticeOkFile. 2019-07-17 16:55:32 +08:00
wangyidong fc82d05224 * adjust for make zentaoxx. 2019-07-17 13:54:34 +08:00
wangyidong c99584b248 * adjust for 2019-07-17 11:20:44 +08:00
wangyidong 564562925c * fix bug #1824 in backyard. zentaopms_11.6.stable_20190717 2019-07-17 09:20:46 +08:00
wangyidong bc09bbb48a * change for downloadxxd. 2019-07-17 09:11:56 +08:00
wangyidong fab4290b35 * adjust for api lang. 2019-07-16 16:47:28 +08:00
wangyidong 0f82741d36 * fix bug for check project lib priv. 2019-07-16 15:30:30 +08:00
wangyidong 4cc3988012 * change review name. zentaopms_11.6.stable_20190716 2019-07-16 14:04:30 +08:00
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 be9d543c44 Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 11:29:56 +08:00
Catouse 0052275e90 * update kindeditor. 2019-07-16 11:19:10 +08:00
jinianlan 5f6f1dc63f Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-16 11:15:02 +08:00
Catouse 632a099b7f * use english text as default language in zui components. 2019-07-16 11:10:45 +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
Catouse 6ee6194783 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-16 10:58:26 +08:00
Catouse a31d6c47d6 * add icon-share by update icon fonts. 2019-07-16 10:58:20 +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