diff --git a/dev/App/User.js b/dev/App/User.js index c21d080f4..154819268 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -1265,25 +1265,25 @@ bTwitter = Settings.settingsGet('AllowTwitterSocial') ; - Utils.initOnStartOrLangChange(function () { - - $.extend(true, $.magnificPopup.defaults, { - 'tClose': Utils.i18n('MAGNIFIC_POPUP/CLOSE'), - 'tLoading': Utils.i18n('MAGNIFIC_POPUP/LOADING'), - 'gallery': { - 'tPrev': Utils.i18n('MAGNIFIC_POPUP/GALLERY_PREV'), - 'tNext': Utils.i18n('MAGNIFIC_POPUP/GALLERY_NEXT'), - 'tCounter': Utils.i18n('MAGNIFIC_POPUP/GALLERY_COUNTER') - }, - 'image': { - 'tError': Utils.i18n('MAGNIFIC_POPUP/IMAGE_ERROR') - }, - 'ajax': { - 'tError': Utils.i18n('MAGNIFIC_POPUP/AJAX_ERROR') - } - }); - - }, this); +// Utils.initOnStartOrLangChange(function () { +// +// $.extend(true, $.magnificPopup.defaults, { +// 'tClose': Utils.i18n('PREVIEW_POPUP/CLOSE'), +// 'tLoading': Utils.i18n('PREVIEW_POPUP/LOADING'), +// 'gallery': { +// 'tPrev': Utils.i18n('PREVIEW_POPUP/GALLERY_PREV'), +// 'tNext': Utils.i18n('PREVIEW_POPUP/GALLERY_NEXT'), +// 'tCounter': Utils.i18n('PREVIEW_POPUP/GALLERY_COUNTER') +// }, +// 'image': { +// 'tError': Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR') +// }, +// 'ajax': { +// 'tError': Utils.i18n('PREVIEW_POPUP/AJAX_ERROR') +// } +// }); +// +// }, this); if (SimplePace) { diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js index 87d32af36..c819c02cb 100644 --- a/dev/Common/Globals.js +++ b/dev/Common/Globals.js @@ -145,7 +145,7 @@ 'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll,Source', 'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced', - 'extraPlugins': 'plain,signature', + 'extraPlugins': 'plain,bidi', // signature 'allowedContent': true, 'font_defaultLabel': 'Arial', diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index c255ce956..198bd5de3 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -198,6 +198,10 @@ { oConfig.removePlugins += (oConfig.removePlugins ? ',' : '') + 'bidi'; } + else + { + oConfig.removeButtons = oConfig.removeButtons.replace(',bidi', ''); + } } oConfig.enterMode = window.CKEDITOR.ENTER_BR; diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 5166c99eb..0f70cf73f 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -30,14 +30,15 @@ color: #333; margin: 0; float: none; + width: 303px; } - .control-label { +/* .control-label { font-size: 16px; line-height: 30px; - } + }*/ - .control-group { + .controls, .control-group { margin-bottom: 25px; } @@ -50,10 +51,20 @@ border-radius: 3px; } - .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { - font-size: 18px; - height: 30px; - line-height: 29px; + .control-group { + .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { + font-size: 18px; + height: 30px; + line-height: 29px; + } + } + + .controls { + .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { + font-size: 18px; + height: 40px; + line-height: 39px; + } } .signMeLabel, .languageLabel { @@ -79,7 +90,7 @@ color: #999; } - .control-group.error .add-on i { + .controls.error .add-on i, .control-group.error .add-on i { color: #b94a48; } } diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 30a2348d7..ec5e3a51e 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -33,7 +33,7 @@ html.rl-no-preview-pane { left: -1px; overflow: hidden; border: @rlLowBorderSize solid @rlMainDarkColor; - + .border-top-right-radius(@rlLowBorderRadius); .border-bottom-right-radius(@rlLowBorderRadius); @@ -218,7 +218,9 @@ html.rl-no-preview-pane { .attachmentsPlace { - padding: 10px; + padding: 10px 10px 6px 10px; + background: #eee; + border-bottom: 1px solid #ddd; .attachmentList { @@ -235,17 +237,20 @@ html.rl-no-preview-pane { cursor: pointer; list-style: none; line-height: 24px; - border: 2px solid grey; + /*border: 2px solid grey;*/ + border: 0; background-color: #fff; - box-shadow: 1px 1px 5px #ccc; - box-shadow: 1px 1px 5px rgba(0,0,0,0.1); + box-shadow: 0 1px 5px #ccc; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1); - border-radius: 6px; + border-radius: 2px; .attachmentIcon { font-size: 23px; width: 23px; height: 23px; + color: #666; } .attachmentPreview { diff --git a/dev/Styles/SettingsIdentities.less b/dev/Styles/SettingsIdentities.less index 5a600587e..5545ef66a 100644 --- a/dev/Styles/SettingsIdentities.less +++ b/dev/Styles/SettingsIdentities.less @@ -10,7 +10,7 @@ .e-signature-place { display: inline-block; width: 680px; - width: 725px; + width: 730px; height: 250px; } diff --git a/dev/Styles/SettingsIdentity.less b/dev/Styles/SettingsIdentity.less index a99427467..cb95e2f64 100644 --- a/dev/Styles/SettingsIdentity.less +++ b/dev/Styles/SettingsIdentity.less @@ -3,7 +3,7 @@ .e-signature-place { display: inline-block; width: 680px; - width: 725px; + width: 730px; height: 250px; } } diff --git a/dev/Styles/_CkeFix.less b/dev/Styles/_CkeFix.less index 158f07624..708572c55 100644 --- a/dev/Styles/_CkeFix.less +++ b/dev/Styles/_CkeFix.less @@ -27,7 +27,7 @@ } .cke_combo_button { - background: #FBFBFB !important; + /*background: #FBFBFB !important;*/ } .cke_source { diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less index 33dfbbfa9..177bb118f 100644 --- a/dev/Styles/_End.less +++ b/dev/Styles/_End.less @@ -10,4 +10,15 @@ .mfp-container .mfp-figure { min-height: 300px; min-width: 300px; +} + +.pswp__error-msg { + color: #ccc; + a, a:hover { + color: #fff; + } +} + +.pswp__img--placeholder { + opacity: 0; } \ No newline at end of file diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 2039a4eb8..e0ef5a387 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -461,9 +461,12 @@ var oIDs = {}, sResult = '', + sEmail = '', + fFindHelper = function (oItem) { if (oItem && oItem.email && oIDs[oItem.email]) { + sEmail = oItem.email; sResult = oIDs[oItem.email]; return true; } @@ -507,9 +510,10 @@ if ('' === sResult) { sResult = Data.accountEmail(); + sEmail = sResult; } - return sResult; + return [sResult, sEmail]; }; ComposePopupView.prototype.selectIdentity = function (oIdentity) @@ -744,6 +748,7 @@ sReplyTitle = '', aResplyAllParts = [], oExcludeEmail = {}, + oIdResult = null, mEmail = Data.accountEmail(), sSignature = Data.signature(), bSignatureToAll = Data.signatureToAll(), @@ -780,7 +785,13 @@ oExcludeEmail[mEmail] = true; } - this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage)); + oIdResult = this.findIdentityIdByMessage(sComposeType, oMessage); + if (oIdResult && oIdResult[0]) + { + oExcludeEmail[oIdResult[1]] = true; + this.currentIdentityID(oIdResult[0]); + } + this.reset(); if (Utils.isNonEmptyArray(aToEmails)) diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index e65b540c4..ae158bc2b 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -13,6 +13,8 @@ Utils = require('Common/Utils'), Links = require('Common/Links'), + Plugins = require('Common/Plugins'), + Settings = require('Storage/Settings'), Data = require('Storage/User/Data'), Remote = require('Storage/User/Remote'), @@ -111,6 +113,27 @@ return false; } + var + iPluginResultCode = 0, + sPluginResultMessage = '', + fSubmitResult = function (iResultCode, sResultMessage) { + iPluginResultCode = iResultCode || 0; + sPluginResultMessage = sResultMessage || ''; + } + ; + + Plugins.runHook('user-login-submit', [fSubmitResult]); + if (0 < iPluginResultCode) + { + this.submitError(Utils.getNotification(iPluginResultCode)); + return false; + } + else if ('' !== sPluginResultMessage) + { + this.submitError(sPluginResultMessage); + return false; + } + this.submitRequest(true); var diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 2fa1cd386..e95094beb 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -9,6 +9,9 @@ ko = require('ko'), key = require('key'), + PhotoSwipe = require('PhotoSwipe'), + PhotoSwipeUI_Default = require('PhotoSwipeUI_Default'), + Consts = require('Common/Consts'), Enums = require('Common/Enums'), Globals = require('Common/Globals'), @@ -43,6 +46,8 @@ this.oMessageScrollerDom = null; + this.pswp = null; + this.message = Data.message; this.currentMessage = Data.currentMessage; this.messageListChecked = Data.messageListChecked; @@ -323,7 +328,11 @@ MessageViewMailBoxUserView.prototype.onBuild = function (oDom) { - var self = this; + var + self = this, + sErrorMessage = Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR') + ; + this.fullScreenMode.subscribe(function (bValue) { if (bValue) { @@ -331,25 +340,89 @@ } }, this); - $('.attachmentsPlace', oDom).magnificPopup({ - 'delegate': '.magnificPopupImage:visible', - 'type': 'image', - 'gallery': { - 'enabled': true, - 'preload': [1, 1], - 'navigateByImgClick': true - }, - 'callbacks': { - 'open': function() { - Globals.useKeyboardShortcuts(false); - }, - 'close': function() { - Globals.useKeyboardShortcuts(true); - } - }, - 'mainClass': 'mfp-fade', - 'removalDelay': 400 - }); +// $('.attachmentsPlace', oDom).magnificPopup({ +// 'delegate': '.attachmentImagePreview:visible', +// 'type': 'image', +// 'gallery': { +// 'enabled': true, +// 'preload': [1, 1], +// 'navigateByImgClick': true +// }, +// 'callbacks': { +// 'open': function() { +// Globals.useKeyboardShortcuts(false); +// }, +// 'close': function() { +// Globals.useKeyboardShortcuts(true); +// } +// }, +// 'mainClass': 'mfp-fade', +// 'removalDelay': 400 +// }); + + this.pswpDom = $('.pswp', oDom)[0]; + if (this.pswpDom) + { + oDom + .on('click', 'a.attachmentImagePreview[data-index]:visible', function (oEvent) { + + var + oPs = null, + oEl = oEvent.currentTarget || null, + aItems = [] + ; + + oDom.find('a.attachmentImagePreview:visible').each(function (index, oSubElement) { + + var $oItem = $(oSubElement); + + aItems.push({ + w: 600, h: 400, + 'src': $oItem.attr('href'), + 'title': $oItem.attr('title') || '' + }); + + }); + + if (aItems && 0 < aItems.length) + { + Globals.useKeyboardShortcuts(false); + + oPs = new PhotoSwipe(self.pswpDom, PhotoSwipeUI_Default, aItems, { + 'index': Utils.pInt($(oEl).data('index')), + 'bgOpacity': 0.85, + 'loadingIndicatorDelay': 500, + 'errorMsg': '
' + sErrorMessage + '
', + 'showHideOpacity': true, + 'tapToToggleControls': false, + 'timeToIdle': 0, + 'timeToIdleOutside': 0, + 'history': false, + 'arrowEl': 1 < aItems.length, + 'counterEl': 1 < aItems.length, + 'shareEl': false + }); + + oPs.listen('imageLoadComplete', function(index, item) { + if (item && item.img && item.img.width && item.img.height) + { + item.w = item.img.width; + item.h = item.img.height; + + oPs.updateSize(); + } + }); + + oPs.listen('close', function() { + Globals.useKeyboardShortcuts(true); + }); + + oPs.init(); + } + + return false; + }); + } oDom .on('click', 'a', function (oEvent) { diff --git a/gulpfile.js b/gulpfile.js index d1529077d..c6a8e3d70 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -95,11 +95,13 @@ cfg.paths.css = { 'vendors/normalize/normalize.css', 'vendors/fontastic/styles.css', 'vendors/jquery-nanoscroller/nanoscroller.css', - 'vendors/jquery-magnific-popup/magnific-popup.css', - 'vendors/jquery-magnific-popup/magnific-popup-animations.css', +// 'vendors/jquery-magnific-popup/magnific-popup.css', +// 'vendors/jquery-magnific-popup/magnific-popup-animations.css', 'vendors/jquery-letterfx/jquery-letterfx.min.css', 'vendors/simple-pace/styles.css', 'vendors/inputosaurus/inputosaurus.css', + 'vendors/photoswipe/photoswipe.css', + 'vendors/photoswipe/default-skin/default-skin.css', 'vendors/flags/flags-fixed.css', cfg.paths.staticCSS + cfg.paths.less.main.name ] @@ -162,10 +164,12 @@ cfg.paths.js = { 'vendors/ssm/ssm.min.js', 'vendors/jua/jua.min.js', 'vendors/Autolinker/Autolinker.min.js', + 'vendors/photoswipe/photoswipe.min.js', + 'vendors/photoswipe/photoswipe-ui-default.min.js', 'vendors/jsencrypt/jsencrypt.min.js', 'vendors/keymaster/keymaster.min.js', 'vendors/ifvisible/ifvisible.min.js', - 'vendors/jquery-magnific-popup/jquery.magnific-popup.min.js', +// 'vendors/jquery-magnific-popup/jquery.magnific-popup.min.js', 'vendors/bootstrap/js/bootstrap.min.js' ] }, @@ -411,6 +415,7 @@ gulp.task('ckeditor:copy', ['ckeditor:clear'], function() { }); gulp.task('ckeditor:copy-plugins', ['ckeditor:copy'], function() { + return true; return gulp.src('vendors/ckeditor-plugins/**/*') .pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/ckeditor/plugins')); }); @@ -418,7 +423,7 @@ gulp.task('ckeditor:copy-plugins', ['ckeditor:copy'], function() { gulp.task('ckeditor', ['ckeditor:copy-plugins'], function () { return gulp.src('rainloop/v/' + cfg.devVersion + '/static/ckeditor/*.js') .pipe(stripbom()) - .pipe(replace("\u200B", "\\u200B")) +// .pipe(replace("\u200B", "\\u200B")) .pipe(header("\uFEFF")) // BOM .pipe(gulp.dest('rainloop/v/' + cfg.devVersion + '/static/ckeditor')); }); diff --git a/package.json b/package.json index a35dc8e77..6e52b4a3a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.7.0", - "release": "207", + "release": "210", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", diff --git a/plugins/recaptcha-2/index.php b/plugins/recaptcha-2/index.php new file mode 100644 index 000000000..b3426cc02 --- /dev/null +++ b/plugins/recaptcha-2/index.php @@ -0,0 +1,150 @@ +UseLangs(true); + + $this->addJs('js/recaptcha.js'); + + $this->addHook('ajax.action-pre-call', 'AjaxActionPreCall'); + $this->addHook('filter.ajax-response', 'FilterAjaxResponse'); + + $this->addTemplate('templates/PluginLoginReCaptchaGroup.html'); + $this->addTemplateHook('Login', 'BottomControlGroup', 'PluginLoginReCaptchaGroup'); + } + + /** + * @return array + */ + public function configMapping() + { + return array( + \RainLoop\Plugins\Property::NewInstance('public_key')->SetLabel('Site key') + ->SetAllowedInJs(true) + ->SetDefaultValue(''), + \RainLoop\Plugins\Property::NewInstance('private_key')->SetLabel('Secret key') + ->SetDefaultValue(''), + \RainLoop\Plugins\Property::NewInstance('theme')->SetLabel('Theme') + ->SetAllowedInJs(true) + ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION) + ->SetDefaultValue(array('light', 'dark')), + \RainLoop\Plugins\Property::NewInstance('error_limit')->SetLabel('Limit') + ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION) + ->SetDefaultValue(array(0, 1, 2, 3, 4, 5)) + ->SetDescription('') + ); + } + + /** + * @return string + */ + private function getCaptchaCacherKey() + { + return 'Captcha2/Login/'.\RainLoop\Utils::GetConnectionToken(); + } + + /** + * @return int + */ + private function getLimit() + { + $iConfigLimit = $this->Config()->Get('plugin', 'error_limit', 0); + if (0 < $iConfigLimit) + { + $oCacher = $this->Manager()->Actions()->Cacher(); + $sLimit = $oCacher && $oCacher->IsInited() ? $oCacher->Get($this->getCaptchaCacherKey()) : '0'; + + if (0 < \strlen($sLimit) && \is_numeric($sLimit)) + { + $iConfigLimit -= (int) $sLimit; + } + } + + return $iConfigLimit; + } + + /** + * @return void + */ + public function FilterAppDataPluginSection($bAdmin, $bAuth, &$aData) + { + if (!$bAdmin && !$bAuth && \is_array($aData)) + { + $aData['show_captcha_on_login'] = 1 > $this->getLimit(); + } + } + + /** + * @param string $sAction + */ + public function AjaxActionPreCall($sAction) + { + if ('Login' === $sAction && 0 >= $this->getLimit()) + { + $bResult = false; + + $sResult = $this->Manager()->Actions()->Http()->GetUrlAsString( + 'https://www.google.com/recaptcha/api/siteverify?secret='. + \urlencode($this->Config()->Get('plugin', 'private_key', '')).'&response='. + \urlencode($this->Manager()->Actions()->GetActionParam('RecaptchaResponse', ''))); + + if ($sResult) + { + $aResp = @\json_decode($sResult, true); + if (\is_array($aResp) && isset($aResp['success']) && $aResp['success']) + { + $bResult = true; + } + } + + if (!$bResult) + { + $this->Manager()->Actions()->Logger()->Write('RecaptchaResponse:'.$sResult); + throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CaptchaError); + } + } + } + + /** + * @param string $sAction + * @param array $aResponseItem + */ + public function FilterAjaxResponse($sAction, &$aResponseItem) + { + if ('Login' === $sAction && $aResponseItem && isset($aResponseItem['Result'])) + { + $oCacher = $this->Manager()->Actions()->Cacher(); + $iConfigLimit = (int) $this->Config()->Get('plugin', 'error_limit', 0); + $sKey = $this->getCaptchaCacherKey(); + + if (0 < $iConfigLimit && $oCacher && $oCacher->IsInited()) + { + if (false === $aResponseItem['Result']) + { + $iLimit = 0; + $sLimut = $oCacher->Get($sKey); + if (0 < \strlen($sLimut) && \is_numeric($sLimut)) + { + $iLimit = (int) $sLimut; + } + + $oCacher->Set($sKey, ++$iLimit); + + if ($iConfigLimit <= $iLimit) + { + $aResponseItem['Captcha'] = true; + } + } + else + { + $oCacher->Delete($sKey); + } + } + } + } +} diff --git a/plugins/recaptcha-2/js/recaptcha.js b/plugins/recaptcha-2/js/recaptcha.js new file mode 100644 index 000000000..d824f5a18 --- /dev/null +++ b/plugins/recaptcha-2/js/recaptcha.js @@ -0,0 +1,83 @@ + +$(function () { + + var + nId = null, + bStarted = false + ; + + function ShowRecaptcha() + { + if (window.grecaptcha) + { + if (null === nId) + { + $('#recaptcha-place').show(); + + nId = window.grecaptcha.render('recaptcha-div', { + 'sitekey': window.rl.pluginSettingsGet('recaptcha-2', 'public_key'), + 'theme': window.rl.pluginSettingsGet('recaptcha-2', 'theme') + }); + } + } + } + + window.__globalShowRecaptcha = ShowRecaptcha; + + function StartRecaptcha() + { + if (!window.grecaptcha && window.rl) + { + $.getScript('https://www.google.com/recaptcha/api.js?onload=__globalShowRecaptcha&render=explicit&hl=' + window.rl.settingsGet('Language')); + } + else + { + ShowRecaptcha(); + } + } + + if (window.rl) + { + window.rl.addHook('user-login-submit', function (fSubmitResult) { + if (null !== nId && !window.grecaptcha.getResponse(nId)) + { + fSubmitResult(105); + } + }); + + window.rl.addHook('view-model-on-show', function (sName, oViewModel) { + if (!bStarted && oViewModel && + ('View:RainLoop:Login' === sName || 'View/App/Login' === sName || 'LoginViewModel' === sName || 'LoginAppView' === sName) && + window.rl.pluginSettingsGet('recaptcha-2', 'show_captcha_on_login')) + { + bStarted = true; + StartRecaptcha(); + } + }); + + window.rl.addHook('ajax-default-request', function (sAction, oParameters) { + if ('Login' === sAction && oParameters && null !== nId && window.grecaptcha) + { + oParameters['RecaptchaResponse'] = window.grecaptcha.getResponse(nId); + } + }); + + window.rl.addHook('ajax-default-response', function (sAction, oData, sType) { + if ('Login' === sAction) + { + if (!oData || 'success' !== sType || !oData['Result']) + { + if (null !== nId && window.grecaptcha) + { + window.grecaptcha.reset(nId); + } + else if (oData && oData['Captcha']) + { + StartRecaptcha(); + } + + } + } + }); + } +}); \ No newline at end of file diff --git a/plugins/recaptcha-2/templates/PluginLoginReCaptchaGroup.html b/plugins/recaptcha-2/templates/PluginLoginReCaptchaGroup.html new file mode 100644 index 000000000..1f4332f6e --- /dev/null +++ b/plugins/recaptcha-2/templates/PluginLoginReCaptchaGroup.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/plugins/recaptcha/VERSION b/plugins/recaptcha/VERSION index 468437494..872765e5f 100644 --- a/plugins/recaptcha/VERSION +++ b/plugins/recaptcha/VERSION @@ -1 +1 @@ -1.8 \ No newline at end of file +1.9 \ No newline at end of file diff --git a/plugins/recaptcha/templates/PluginLoginReCaptchaGroup.html b/plugins/recaptcha/templates/PluginLoginReCaptchaGroup.html index e6595a774..4a15d78c6 100644 --- a/plugins/recaptcha/templates/PluginLoginReCaptchaGroup.html +++ b/plugins/recaptcha/templates/PluginLoginReCaptchaGroup.html @@ -1,14 +1,14 @@ - -
-
+ +
- @@ -16,9 +16,9 @@
-
+
- @@ -26,8 +26,8 @@
-
- diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html index 94625236c..e2a8912df 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html @@ -16,11 +16,11 @@
- + {{INCLUDE/TopControlGroup/PLACE}} -
+
- @@ -28,9 +28,9 @@
-
+
- @@ -38,16 +38,16 @@
-
+
-
-
+
{{INCLUDE/BottomControlGroup/PLACE}} -
-
-
- +
+
-
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html index 0525443e8..221ee8a56 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -1,3 +1,4 @@ +
@@ -270,8 +271,8 @@
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html b/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html new file mode 100644 index 000000000..055b5de52 --- /dev/null +++ b/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini index 26e741c4f..0461f57c1 100644 --- a/rainloop/v/0.0.0/langs/bg.ini +++ b/rainloop/v/0.0.0/langs/bg.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "До 6 месеца" LABEL_ADV_DATE_YEAR = "До 1 година" BUTTON_ADV_SEARCH = "Търси" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Затваряне (Esc)" LOADING = "Зареждане..." GALLERY_PREV = "Предишно (Бутон лява стрелка)" diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini index 56a82fd10..ae01a1f94 100644 --- a/rainloop/v/0.0.0/langs/de.ini +++ b/rainloop/v/0.0.0/langs/de.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Nicht älter als 6 Monate" LABEL_ADV_DATE_YEAR = "Nicht älter als 1 Jahr" BUTTON_ADV_SEARCH = "Suchen" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Schließen (Esc)" LOADING = "Wird geladen ..." GALLERY_PREV = "Vorher (Linke Pfeil-Taste)" diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini index 45681a3a6..38e47eebb 100644 --- a/rainloop/v/0.0.0/langs/en.ini +++ b/rainloop/v/0.0.0/langs/en.ini @@ -39,11 +39,13 @@ LABEL_ADV_DATE_6_MONTHS = "Up to 6 months old" LABEL_ADV_DATE_YEAR = "Up to 1 year old" BUTTON_ADV_SEARCH = "Search" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Close (Esc)" LOADING = "Loading..." -GALLERY_PREV = "Previous (Left arrow key)" -GALLERY_NEXT = "Next (Right arrow key)" +GALLERY_PREV = "Previous (arrow left)" +GALLERY_NEXT = "Next (arrow right)" GALLERY_COUNTER = "%curr% of %total%" IMAGE_ERROR = "The image could not be loaded." AJAX_ERROR = "The content could not be loaded." diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini index efeae9cb7..e734b4a60 100644 --- a/rainloop/v/0.0.0/langs/es.ini +++ b/rainloop/v/0.0.0/langs/es.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Hasta 6 meses de antiguedad" LABEL_ADV_DATE_YEAR = "Hasta 1 año de antiguedad" BUTTON_ADV_SEARCH = "Buscar" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Cerrar (Esc)" LOADING = "Cargando" GALLERY_PREV = "Anteriores (Flecha Izquierda)" diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini index 59303137b..f736030fb 100644 --- a/rainloop/v/0.0.0/langs/fr.ini +++ b/rainloop/v/0.0.0/langs/fr.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Jusqu'à 6 mois" LABEL_ADV_DATE_YEAR = "Jusqu'à un an" BUTTON_ADV_SEARCH = "Rechercher" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Fermer (Esc)" LOADING = "Chargement..." GALLERY_PREV = "Précédent (flèche gauche)" diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini index b2f7f1b35..0bde5b896 100644 --- a/rainloop/v/0.0.0/langs/hu.ini +++ b/rainloop/v/0.0.0/langs/hu.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Legfeljebb 6 hónapos" LABEL_ADV_DATE_YEAR = "Legfeljebb 1 éves" BUTTON_ADV_SEARCH = "Keresés" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Bezárás (Esc)" LOADING = "Betőltés..." GALLERY_PREV = "Előző (Bal nyíl gomb)" diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini index a9dbcabb4..6d018afed 100644 --- a/rainloop/v/0.0.0/langs/is.ini +++ b/rainloop/v/0.0.0/langs/is.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Upp að 6 mánaða gömlu" LABEL_ADV_DATE_YEAR = "Upp að árs gömlu" BUTTON_ADV_SEARCH = "Leita" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Loka (Esc)" LOADING = "Hleð..." GALLERY_PREV = "Fyrri (Vinstri örvar takki)" diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini index 867294697..afb0cd297 100644 --- a/rainloop/v/0.0.0/langs/it.ini +++ b/rainloop/v/0.0.0/langs/it.ini @@ -40,7 +40,9 @@ LABEL_ADV_DATE_6_MONTHS = "Meno di 6 mesi fa" LABEL_ADV_DATE_YEAR = "Meno di un anno fa" BUTTON_ADV_SEARCH = "Cerca" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Chiudi (Esc)" LOADING = "Caricamento..." GALLERY_PREV = "Precedente (Freccia sinistra)" diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini index 92fc515e5..123386311 100644 --- a/rainloop/v/0.0.0/langs/ja-jp.ini +++ b/rainloop/v/0.0.0/langs/ja-jp.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "6ヶ月前まで" LABEL_ADV_DATE_YEAR = "1年前まで" BUTTON_ADV_SEARCH = "検索" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "閉じる (Esc)" LOADING = "読み込み中..." GALLERY_PREV = "前 (Left arrow key)" diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini index 4c5a7cba1..7ab12306b 100644 --- a/rainloop/v/0.0.0/langs/ko-kr.ini +++ b/rainloop/v/0.0.0/langs/ko-kr.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "6개월 이내" LABEL_ADV_DATE_YEAR = "1년 이내" BUTTON_ADV_SEARCH = "찾기" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "닫기 (Esc)" LOADING = "로딩 중..." GALLERY_PREV = "이전 (왼쪽 방향키)" diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini index 9e4a323e6..826d0d0da 100644 --- a/rainloop/v/0.0.0/langs/lt.ini +++ b/rainloop/v/0.0.0/langs/lt.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Nesenesni kaip 6 mėnesių" LABEL_ADV_DATE_YEAR = "Nesenesni kaip 1 metų" BUTTON_ADV_SEARCH = "Ieškoti" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Uždaryti (Esc)" LOADING = "Kraunasi..." GALLERY_PREV = "Ankstesnis (Rodyklė kairėn)" diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini index 4a397cd2b..3233f28a1 100644 --- a/rainloop/v/0.0.0/langs/lv.ini +++ b/rainloop/v/0.0.0/langs/lv.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Līdz 6 mēnešus vecs" LABEL_ADV_DATE_YEAR = "Līdz 1 gadu vecs" BUTTON_ADV_SEARCH = "Meklēt" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Aizvērt (Esc)" LOADING = "Lādējas..." GALLERY_PREV = "Iepriekšejā (Kreisā būltiņa)" diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini index 5c4ca106e..133f75aa2 100644 --- a/rainloop/v/0.0.0/langs/nl.ini +++ b/rainloop/v/0.0.0/langs/nl.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Tot 6 maanden oud" LABEL_ADV_DATE_YEAR = "Tot 1 jaar oud" BUTTON_ADV_SEARCH = "Zoeken" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Sluiten (Esc)" LOADING = "Ophalen..." GALLERY_PREV = "Vorige (Linker Pijl toets)" diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini index 9f7cf29c6..ad6861587 100644 --- a/rainloop/v/0.0.0/langs/no.ini +++ b/rainloop/v/0.0.0/langs/no.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Inntil 6 måneder gamle" LABEL_ADV_DATE_YEAR = "Inntil 1 år gammel" BUTTON_ADV_SEARCH = "Søk" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Lukk (Esc)" LOADING = "Laster..." GALLERY_PREV = "Forrige (venstre piltast)" diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini index a6f03c4df..c7a6d9131 100644 --- a/rainloop/v/0.0.0/langs/pl.ini +++ b/rainloop/v/0.0.0/langs/pl.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Do 6 miesięcy" LABEL_ADV_DATE_YEAR = "Do 1 roku" BUTTON_ADV_SEARCH = "Szukaj" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Zamknij (Esc)" LOADING = "Ładowanie..." GALLERY_PREV = "Poprzedni (strzałka w lewo)" diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini index 7660d54c1..b97c2f3bb 100644 --- a/rainloop/v/0.0.0/langs/pt-br.ini +++ b/rainloop/v/0.0.0/langs/pt-br.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Até 6 meses atrás" LABEL_ADV_DATE_YEAR = "Até 1 ano atrás" BUTTON_ADV_SEARCH = "Pesquisar" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Fechar (Esc)" LOADING = "Carregando..." GALLERY_PREV = "Anterior (Seta p/ Esquerda)" diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini index 921c3c449..f573a46eb 100644 --- a/rainloop/v/0.0.0/langs/pt-pt.ini +++ b/rainloop/v/0.0.0/langs/pt-pt.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Até 6 meses atrás" LABEL_ADV_DATE_YEAR = "Até 1 ano atrás" BUTTON_ADV_SEARCH = "Pesquisar" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Fechar (Esc)" LOADING = "Carregando..." GALLERY_PREV = "Anterior (Seta p/ Esquerda)" diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini index 98ce8637f..93d64001f 100644 --- a/rainloop/v/0.0.0/langs/ro.ini +++ b/rainloop/v/0.0.0/langs/ro.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "6 luni" LABEL_ADV_DATE_YEAR = "în acest an" BUTTON_ADV_SEARCH = "căutare" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Închide (Esc)" LOADING = "Se îcarcă..." GALLERY_PREV = "Precedentul (Стрелка ←)" diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini index fe2471c66..f797d2dca 100644 --- a/rainloop/v/0.0.0/langs/ru.ini +++ b/rainloop/v/0.0.0/langs/ru.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "За полгода" LABEL_ADV_DATE_YEAR = "За год" BUTTON_ADV_SEARCH = "Искать" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Закрыть (Esc)" LOADING = "Загрузка..." GALLERY_PREV = "Назад (Стрелка ←)" diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini index 84bddc9d1..3c3131e2c 100644 --- a/rainloop/v/0.0.0/langs/sk.ini +++ b/rainloop/v/0.0.0/langs/sk.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Nie staršie ako 6 mesiacov" LABEL_ADV_DATE_YEAR = "Nie staršie ako 1 rok" BUTTON_ADV_SEARCH = "Hľadať" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Zatvoriť (Esc)" LOADING = "Načítavam..." GALLERY_PREV = "Predchádzajúci (šípka vľavo)" diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini index 7e8019ed9..16fdf5840 100644 --- a/rainloop/v/0.0.0/langs/sv.ini +++ b/rainloop/v/0.0.0/langs/sv.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "Upp till 6 månader gammalt" LABEL_ADV_DATE_YEAR = "Upp till 1 år gammalt" BUTTON_ADV_SEARCH = "Sök" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Stäng (Esc)" LOADING = "Laddar..." GALLERY_PREV = "Föregående (Vänster pil knapp)" diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini index d6f24180b..9d30e1a3e 100644 --- a/rainloop/v/0.0.0/langs/tr.ini +++ b/rainloop/v/0.0.0/langs/tr.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "6 ay önceki" LABEL_ADV_DATE_YEAR = "1 yıl önceki" BUTTON_ADV_SEARCH = "Arama" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Kapat (Esc)" LOADING = "Yükleniyor..." GALLERY_PREV = "Önceki (Sol yön tuşu)" diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini index f8cd9a8fb..27fee797d 100644 --- a/rainloop/v/0.0.0/langs/ua.ini +++ b/rainloop/v/0.0.0/langs/ua.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "За півроку" LABEL_ADV_DATE_YEAR = "За рік" BUTTON_ADV_SEARCH = "Шукати" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "Закрити (Esc)" LOADING = "Завантаження..." GALLERY_PREV = "Назад (Стрілка ←)" diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini index 496ae59be..b6ed1aebd 100644 --- a/rainloop/v/0.0.0/langs/zh-cn.ini +++ b/rainloop/v/0.0.0/langs/zh-cn.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "半年以内" LABEL_ADV_DATE_YEAR = "1年以内" BUTTON_ADV_SEARCH = "搜索" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "关闭 (Esc)" LOADING = "加载..." GALLERY_PREV = "向前 (Left arrow key)" diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini index 12370e801..c86ced39e 100644 --- a/rainloop/v/0.0.0/langs/zh-tw.ini +++ b/rainloop/v/0.0.0/langs/zh-tw.ini @@ -39,7 +39,9 @@ LABEL_ADV_DATE_6_MONTHS = "半年以內" LABEL_ADV_DATE_YEAR = "1年以內" BUTTON_ADV_SEARCH = "搜索" -[MAGNIFIC_POPUP] +[PREVIEW_POPUP] +FULLSCREEN = "Toggle fullscreen" +ZOOM = "Zoom in/out" CLOSE = "關閉 (Esc)" LOADING = "載入..." GALLERY_PREV = "向前 (Left arrow key)" diff --git a/rainloop/v/0.0.0/static/ckeditor/CHANGES.md b/rainloop/v/0.0.0/static/ckeditor/CHANGES.md index 12b6062eb..8c1c9ebfd 100644 --- a/rainloop/v/0.0.0/static/ckeditor/CHANGES.md +++ b/rainloop/v/0.0.0/static/ckeditor/CHANGES.md @@ -1,40 +1,6 @@ CKEditor 4 Changelog ==================== -## CKEditor 4.4.6 - -**Security Updates:** - -* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo). - - Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode. - -**An upgrade is highly recommended!** - -New Features: - -* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format). -* [#12550](http://dev.ckeditor.com/ticket/12550): Added the `
` element to the [`CKEDITOR.dtd`](http://docs.ckeditor.com/#!/api/CKEDITOR.dtd). - -Fixed Issues: - -* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Cannot paste into inline editor if the page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)! -* [#12683](http://dev.ckeditor.com/ticket/12683): Fixed: [Filter](http://docs.ckeditor.com/#!/guide/dev_acf) fails to remove custom tags. Thanks to [timselier](https://github.com/timselier)! -* [#12489](http://dev.ckeditor.com/ticket/12489) and [#12491](http://dev.ckeditor.com/ticket/12491): Fixed: Various issues related to restoring the selection after performing operations on filler character. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4). -* [#12621](http://dev.ckeditor.com/ticket/12621): Fixed: Cannot remove inline styles (bold, italic, etc.) in empty lines. -* [#12630](http://dev.ckeditor.com/ticket/12630): [Chrome] Fixed: Selection is placed outside the paragraph when the [New Page](http://ckeditor.com/addon/newpage) button is clicked. This patch significantly simplified the way how the initial selection (a selection after the content of the editable is overwritten) is being fixed. That might have fixed many related scenarios in all browsers. -* [#11647](http://dev.ckeditor.com/ticket/11647): Fixed: The [`editor.blur`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-blur) event is not fired on first blur after initializing the inline editor on an already focused element. -* [#12601](http://dev.ckeditor.com/ticket/12601): Fixed: [Strikethrough](http://ckeditor.com/addon/basicstyles) button tooltip spelling. -* [#12546](http://dev.ckeditor.com/ticket/12546): Fixed: The Preview tab in the [Document Properties](http://ckeditor.com/addon/docprops) dialog window is always disabled. -* [#12300](http://dev.ckeditor.com/ticket/12300): Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event fired on first navigation key press after typing. -* [#12141](http://dev.ckeditor.com/ticket/12141): Fixed: List items are lost when indenting a list item with content wrapped with a block element. -* [#12515](http://dev.ckeditor.com/ticket/12515): Fixed: Cursor is in the wrong position when undoing after adding an image and typing some text. -* [#12484](http://dev.ckeditor.com/ticket/12484): [Blink/Webkit] Fixed: DOM is changed outside the editor area in a certain case. -* [#12688](http://dev.ckeditor.com/ticket/12688): Improved the tests of the [styles system](http://docs.ckeditor.com/#!/api/CKEDITOR.style) and fixed two minor issues. -* [#12403](http://dev.ckeditor.com/ticket/12403): Fixed: Changing the [font](http://ckeditor.com/addon/font) style should not lead to nesting it in the previous style element. -* [#12609](http://dev.ckeditor.com/ticket/12609): Fixed: Incorrect `config.magicline_putEverywhere` name used for a [Magic Line](http://ckeditor.com/addon/magicline) all-encompassing [`config.magicline_everywhere`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-magicline_everywhere) configuration option. - - ## CKEditor 4.4.5 New Features: @@ -109,7 +75,7 @@ New Features: Fixed Issues: * [#12110](http://dev.ckeditor.com/ticket/12110): Fixed: Editor crash after deleting a table. Thanks to [Alin Purcaru](https://github.com/mesmerizero)! -* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: *Enter* key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)! +* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: **Enter** key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)! * [#12140](http://dev.ckeditor.com/ticket/12140): Fixed: Double-clicking linked widgets opens two dialog windows. * [#12132](http://dev.ckeditor.com/ticket/12132): Fixed: Image is inserted with `width` and `height` styles even when they are not allowed. * [#9317](http://dev.ckeditor.com/ticket/9317): [IE] Fixed: [`config.disableObjectResizing`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableObjectResizing) does not work on IE. **Note**: We were not able to fix this issue on IE11+ because necessary events stopped working. See a [last resort workaround](http://dev.ckeditor.com/ticket/9317#comment:16) and make sure to [support our complaint to Microsoft](https://connect.microsoft.com/IE/feedback/details/742593/please-respect-execcommand-enableobjectresizing-in-contenteditable-elements). diff --git a/rainloop/v/0.0.0/static/ckeditor/build-config.js b/rainloop/v/0.0.0/static/ckeditor/build-config.js index 8519c0e80..d8ad5f82a 100644 --- a/rainloop/v/0.0.0/static/ckeditor/build-config.js +++ b/rainloop/v/0.0.0/static/ckeditor/build-config.js @@ -13,10 +13,10 @@ * (1) http://ckeditor.com/builder * Visit online builder to build CKEditor from scratch. * - * (2) http://ckeditor.com/builder/7bd3f7a14b9b0ff5faf671393bb9720b + * (2) http://ckeditor.com/builder/b1845fab7060f947b250c67fb9992be5 * Visit online builder to build CKEditor, starting with the same setup as before. * - * (3) http://ckeditor.com/builder/download/7bd3f7a14b9b0ff5faf671393bb9720b + * (3) http://ckeditor.com/builder/download/b1845fab7060f947b250c67fb9992be5 * Straight download link to the latest version of CKEditor (Optimized) with the same setup as before. * * NOTE: @@ -25,7 +25,7 @@ */ var CKBUILDER_CONFIG = { - skin: 'icy_orange', + skin: 'moono', preset: 'basic', ignore: [ '.bender', @@ -36,7 +36,7 @@ var CKBUILDER_CONFIG = { '.DS_Store', '.gitattributes', '.gitignore', - 'gruntfile.js', + 'Gruntfile.js', '.idea', '.jscsrc', '.jshintignore', @@ -50,7 +50,6 @@ var CKBUILDER_CONFIG = { plugins : { 'base64image' : 1, 'basicstyles' : 1, - 'bidi' : 1, 'blockquote' : 1, 'clipboard' : 1, 'colorbutton' : 1, diff --git a/rainloop/v/0.0.0/static/ckeditor/ckeditor.js b/rainloop/v/0.0.0/static/ckeditor/ckeditor.js index 05b5c9dba..02bb64717 100644 --- a/rainloop/v/0.0.0/static/ckeditor/ckeditor.js +++ b/rainloop/v/0.0.0/static/ckeditor/ckeditor.js @@ -2,14 +2,14 @@ Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,e={timestamp:"EAPE",version:"4.4.6",revision:"08188c4",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var f=window.CKEDITOR_BASEPATH||"";if(!f)for(var d=document.getElementsByTagName("script"),c=0;c=0;s--)if(m[s].priority<=l){m.splice(s+1,0,i);return{removeListener:g}}m.unshift(i)}return{removeListener:g}}, -once:function(){var a=Array.prototype.slice.call(arguments),f=a[1];a[1]=function(a){a.removeListener();return f.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,f=function(){a=1},d=0,b=function(){d=1};return function(l,i,g){var m=e(this)[l],l=a,t=d;a=d=0;if(m){var s=m.listeners;if(s.length)for(var s=s.slice(0),y,p=0;p=0&&d.listeners.splice(b,1)}},removeAllListeners:function(){var a=e(this),f;for(f in a)delete a[f]},hasListeners:function(a){return(a=e(this)[a])&&a.listeners.length> +return{define:function(c,f){var d=a.call(this,c);CKEDITOR.tools.extend(d,f,true)},on:function(c,f,d,b,e){function m(a,p,u,e){a={name:c,sender:this,editor:a,data:p,listenerData:b,stop:u,cancel:e,removeListener:j};return f.call(d,a)===false?false:a.data}function j(){u.removeListener(c,f)}var p=a.call(this,c);if(p.getListenerIndex(f)<0){p=p.listeners;d||(d=this);isNaN(e)&&(e=10);var u=this;m.fn=f;m.priority=e;for(var t=p.length-1;t>=0;t--)if(p[t].priority<=e){p.splice(t+1,0,m);return{removeListener:j}}p.unshift(m)}return{removeListener:j}}, +once:function(){var a=Array.prototype.slice.call(arguments),f=a[1];a[1]=function(a){a.removeListener();return f.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,f=function(){a=1},d=0,b=function(){d=1};return function(h,m,j){var p=e(this)[h],h=a,u=d;a=d=0;if(p){var t=p.listeners;if(t.length)for(var t=t.slice(0),y,n=0;n=0&&d.listeners.splice(b,1)}},removeAllListeners:function(){var a=e(this),f;for(f in a)delete a[f]},hasListeners:function(a){return(a=e(this)[a])&&a.listeners.length> 0}}}());CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=true);return CKEDITOR.event.prototype.fire.call(this,a,e,this)},CKEDITOR.editor.prototype.fireOnce=function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=true);return CKEDITOR.event.prototype.fireOnce.call(this,a,e,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)); CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),e={ie:a.indexOf("trident/")>-1,webkit:a.indexOf(" applewebkit/")>-1,air:a.indexOf(" adobeair/")>-1,mac:a.indexOf("macintosh")>-1,quirks:document.compatMode=="BackCompat"&&(!document.documentMode||document.documentMode<10),mobile:a.indexOf("mobile")>-1,iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return false;var a=document.domain,d=window.location.hostname;return a!=d&&a!="["+d+"]"},secure:location.protocol== "https:"};e.gecko=navigator.product=="Gecko"&&!e.webkit&&!e.ie;if(e.webkit)a.indexOf("chrome")>-1?e.chrome=true:e.safari=true;var b=0;if(e.ie){b=e.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode;e.ie9Compat=b==9;e.ie8Compat=b==8;e.ie7Compat=b==7;e.ie6Compat=b<7||e.quirks}if(e.gecko){var c=a.match(/rv:([\d\.]+)/);if(c){c=c[1].split(".");b=c[0]*1E4+(c[1]||0)*100+(c[2]||0)*1}}e.air&&(b=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));e.webkit&&(b=parseFloat(a.match(/ applewebkit\/(\d+)/)[1])); @@ -17,28 +17,29 @@ e.version=b;e.isCompatible=e.iOS&&b>=534||!e.mobile&&(e.ie&&b>6||e.gecko&&b>=2E4 if(e.iOS)e.cssClass=e.cssClass+" cke_browser_ios";if(e.hidpi)e.cssClass=e.cssClass+" cke_hidpi";return e}()); "unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if(CKEDITOR.status!="basic_ready")CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a= CKEDITOR.loadFullCore,e=CKEDITOR.loadFullCoreTimeout;if(a){CKEDITOR.status="basic_ready";a&&a._load?a():e&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},e*1E3)}})})();CKEDITOR.status="basic_loaded"}();CKEDITOR.dom={}; -(function(){var a=[],e=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",b=/&/g,c=/>/g,f=//g,f=/"+f+""):d.push('');return d.join("")}, -htmlEncode:function(a){return(""+a).replace(b,"&").replace(c,">").replace(f,"<")},htmlDecode:function(a){return a.replace(h,"&").replace(l,">").replace(i,"<")},htmlEncodeAttr:function(a){return a.replace(d,""").replace(f,"<").replace(c,">")},htmlDecodeAttr:function(a){return a.replace(g,'"').replace(i,"<").replace(l,">")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},override:function(a,f){var d=f(a);d.prototype= +htmlEncode:function(a){return(""+a).replace(b,"&").replace(c,">").replace(f,"<")},htmlDecode:function(a){return a.replace(g,"&").replace(h,">").replace(m,"<")},htmlEncodeAttr:function(a){return a.replace(d,""").replace(f,"<").replace(c,">")},htmlDecodeAttr:function(a){return a.replace(j,'"').replace(m,"<").replace(h,">")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},override:function(a,f){var d=f(a);d.prototype= a.prototype;return d},setTimeout:function(a,f,d,b,c){c||(c=window);d||(d=c);return c.setTimeout(function(){b?a.apply(d,[].concat(b)):a.apply(d)},f||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(f){return f.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(f){return f.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(f){return f.replace(a,"")}}(),indexOf:function(a,f){if(typeof f=="function")for(var d=0,b=a.length;d=0?a[d]:null},bind:function(a,f){return function(){return a.apply(f,arguments)}},createClass:function(a){var f=a.$,d=a.base,b=a.privates||a._,c=a.proto,a=a.statics;!f&&(f=function(){d&&this.base.apply(this,arguments)});if(b)var e=f,f=function(){var a=this._||(this._={}),f;for(f in b){var d=b[f];a[f]=typeof d=="function"?CKEDITOR.tools.bind(d,this):d}e.apply(this,arguments)};if(d){f.prototype= this.prototypedCopy(d.prototype);f.prototype.constructor=f;f.base=d;f.baseProto=d.prototype;f.prototype.base=function(){this.base=d.prototype.base;d.apply(this,arguments);this.base=arguments.callee}}c&&this.extend(f.prototype,c,true);a&&this.extend(f,a,true);return f},addFunction:function(f,d){return a.push(function(){return f.apply(d||this,arguments)})-1},removeFunction:function(f){a[f]=null},callFunction:function(f){var d=a[f];return d&&d.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a= /^-?\d+\.?\d*px$/,f;return function(d){f=CKEDITOR.tools.trim(d+"")+"px";return a.test(f)?f:d||""}}(),convertToPx:function(){var a;return function(f){if(!a){a=CKEDITOR.dom.element.createFromHtml('
',CKEDITOR.document);CKEDITOR.document.getBody().append(a)}if(!/%$/.test(f)){a.setStyle("width",f);return a.$.clientWidth}return f}}(),repeat:function(a,f){return Array(f+1).join(a)},tryThese:function(){for(var a, f=0,d=arguments.length;f]*?>)|^/i,'$&\n