mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
2016 -> 2017
+ Small fixes
This commit is contained in:
parent
39c07bfc13
commit
6a6f420c76
16 changed files with 297 additions and 294 deletions
|
|
@ -20,4 +20,4 @@ It's not recommended to use in production environment.
|
|||
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
|
||||
http://www.gnu.org/licenses/agpl-3.0.html
|
||||
|
||||
Copyright (c) 2016 Rainloop Team
|
||||
Copyright (c) 2017 Rainloop Team
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* ownCloud/Nextcloud - RainLoop Webmail package
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* ownCloud - RainLoop mail plugin
|
||||
*
|
||||
* @author RainLoop Team
|
||||
* @copyright 2016 RainLoop Team
|
||||
* @copyright 2017 RainLoop Team
|
||||
*
|
||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -85,7 +85,10 @@
|
|||
padding: 10px;
|
||||
background-color: #eee;
|
||||
color: #333;
|
||||
overflow:scroll;
|
||||
|
||||
html.rl-mobile &{
|
||||
overflow: scroll;
|
||||
}
|
||||
|
||||
.e-identity {
|
||||
|
||||
|
|
@ -111,11 +114,12 @@
|
|||
.e-label {
|
||||
text-align: right;
|
||||
width: 1%;
|
||||
min-width: 50px;
|
||||
padding: 6px 10px 6px 0px;
|
||||
min-width: 70px;
|
||||
padding: 6px 10px;
|
||||
|
||||
html.rl-modal {
|
||||
html.rl-mobile &{
|
||||
min-width: 50px;
|
||||
padding: 6px 10px 6px 0px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class ActivatePopupView extends AbstractViewNext
|
|||
this.key.focus(true);
|
||||
}
|
||||
|
||||
}, this.domain(), this.key());
|
||||
}, this.domain(), this.key().replace(/[^A-Z0-9\-]/gi, ''));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -122,7 +122,7 @@ class ActivatePopupView extends AbstractViewNext
|
|||
*/
|
||||
validateSubscriptionKey() {
|
||||
const value = this.key();
|
||||
return '' === value || RAINLOOP_TRIAL_KEY === value || !!(/^RL[\d]+-[A-Z0-9\-]+Z$/).test(trim(value));
|
||||
return '' === value || RAINLOOP_TRIAL_KEY === value || !!(/^RL[\d]+-[A-Z0-9\-]+Z$/).test(trim(value).replace(/[^A-Z0-9\-]/gi, ''));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* This file is part of MailSo.
|
||||
*
|
||||
* (c) 2016 Usenko Timur
|
||||
* (c) 2014 Usenko Timur
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
|
|
|||
|
|
@ -1131,7 +1131,7 @@ class Actions
|
|||
'][APC:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_fetch') ? 'on' : 'off').
|
||||
'][MB:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_convert_encoding') ? 'on' : 'off').
|
||||
'][PDO:'.$sPdo.
|
||||
(\RainLoop\Utils::IsOwnCloud() ? '][ownCloud:true' : '').
|
||||
(\RainLoop\Utils::IsOwnCloud() ? '][cloud:true' : '').
|
||||
'][Streams:'.\implode(',', \stream_get_transports()).
|
||||
']');
|
||||
|
||||
|
|
@ -2951,7 +2951,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
|
|||
if (!empty($sAction) && !$bError && \is_array($aData) && 0 < \count($aData) &&
|
||||
$oFilesProvider && $oFilesProvider->IsActive())
|
||||
{
|
||||
|
||||
$bError = false;
|
||||
switch (\strtolower($sAction))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ class Service
|
|||
|
||||
if (\RainLoop\Utils::IsOwnCloud())
|
||||
{
|
||||
$sResult .= '][owncloud:true';
|
||||
$sResult .= '][cloud:true';
|
||||
}
|
||||
|
||||
$sResult .= ']-->';
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<div class="span4">
|
||||
<div class="rl-logo"></div>
|
||||
<div style="margin-left: 30px;">
|
||||
2016 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
|
||||
2017 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
|
||||
<br />
|
||||
<a class="g-ui-link" href="http://www.rainloop.net/" target="_blank" style="padding-left: 0">http://rainloop.net/</a>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue