Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.6.0 release

Browse source 
CardDav support.
New skin (Blurred).
Login animation.
Small fixes.
This commit is contained in:
RainLoop Team 2013-12-27 05:00:40 +04:00
parent bc6c320ecb
commit 011855bf8a
26 changed files with 386 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/configs/apache2/dav.mydomain.com
View file

@ -1,5 +1,4 @@
<VirtualHost *:80>
AcceptPathInfo On
ServerName dav.mydomain.com
DocumentRoot /var/www/mydomain.com
@ -12,5 +11,4 @@
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost>

2
build/configs/apache2/mydomain.com
View file

@ -1,5 +1,4 @@
<VirtualHost *:80>
AcceptPathInfo On
ServerName mydomain.com
DocumentRoot /var/www/mydomain.com
@ -12,5 +11,4 @@
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost>

10
build/configs/nginx/dav.mydomain.com.conf
View file

@ -1,10 +1,9 @@
server {
listen 80;
server_name dav.mydomain.com;
root /var/www/mydomain.com;
access_log /var/log/nginx/dav.mydomain.com.access.log main;
access_log /var/log/nginx/dav.mydomain.com.access.log;
error_log /var/log/nginx/dav.mydomain.com.error.log;
index index.php;
@ -19,17 +18,20 @@ server {
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
location = /humans.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
# rewrite for carddav autoprovision
rewrite ^/.well-known/carddav / redirect;
rewrite ^(.*)$ /index.php/dav$1 last;
# php for carddav only
location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000;
# fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;

13
build/configs/nginx/mydomain.com.conf
View file

@ -1,10 +1,9 @@
server {
listen 80;
server_name mydomain.com;
root /var/www/mydomain.com;
access_log /var/log/nginx/mydomain.com.access.log main;
access_log /var/log/nginx/mydomain.com.access.log;
error_log /var/log/nginx/mydomain.com.error.log;
index index.php index.html;
@ -19,16 +18,18 @@ server {
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
location = /humans.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
# rewrite for carddav autoprovision
rewrite ^/.well-known/carddav /index.php/dav/ redirect;
# php for carddav
location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000;
# fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;
@ -38,10 +39,10 @@ server {
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
}
# php (other)
location ~ \.php {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000;
# fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
}

3
dev/Common/_End.js
View file

@ -34,8 +34,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart();
$html.addClass('rl-started');
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
}, 50);
}

17
dev/Knoin/Knoin.js
View file

@ -36,11 +36,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function ()
{
$('#rl-loading').hide();
@ -307,6 +302,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/
Knoin.prototype.startScreens = function (aScreensClasses)
{
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) {
var
@ -345,6 +344,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross);
hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
};
/**

18
dev/Styles/Animations.less
View file

@ -51,8 +51,26 @@
0% {background-position: 0 0;} 100% {background-position: 60px 0;}
}
html.rl-started-trigger .b-login-content .loginFormWrapper {
-webkit-transform: translateY(-30px);
-moz-transform: translateY(-30px);
transform: translateY(-30px);
}
html.rl-started-trigger #rl-content {
.opacity(70);
}
.rl-anim {
&.csstransitions #rl-content {
.transition(~"0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940)");
}
&.csstransitions .b-login-content .loginFormWrapper {
.transition(~"0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940)");
}
&.rgba.cssanimations.backgroundsize .e-strip-animation {
-webkit-background-size: 60px 60px;
-moz-background-size: 60px 60px;

72
dev/Styles/_Select2Fix.less
View file

@ -1,72 +0,0 @@
.select2-container-multi {
.select2-choices {
background-image: none;
border: @rlInputBorderSize solid @inputBorder;
.border-radius(@inputBorderRadius);
.select2-search-choice {
line-height: 15px;
font-size: 16px;
}
}
&.select2-container-active {
.select2-choices {
border: @rlInputBorderSize solid darken(@inputBorder, 20%);
.box-shadow(none);
}
}
}
.select2-drop {
.box-shadow(none);
.select2-subname {
color: #777;
}
.select2-highlighted .select2-subname {
color: #eee;
}
}
.select2-results {
margin: 0;
padding: 0;
max-height: 400px;
.select2-searching {
padding: 1px 4px;
}
}
.select2-icon {
line-height: 20px;
padding: 0 0 0 7px
}
.select2-icon-result {
line-height: 40px;
}
.select2-result-label {
margin: 0px !important;
padding: 5px !important;
font-size: 16px;
height: 40px;
line-height: 40px;
.select2-user-pic {
display: inline-block;
height: 40px;
width: 40px;
margin-right: 10px;
}
}

4
package.json
View file

@ -1,8 +1,8 @@
{
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.5.1",
"release": "557",
"version": "1.6.0",
"release": "615",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "Gruntfile.js",

7
rainloop/v/0.0.0/app/handle.php
View file

@ -5,6 +5,7 @@ namespace RainLoop;
if (!\defined('RAINLOOP_APP_ROOT_PATH'))
{
\define('RAINLOOP_APP_LIBRARIES_PATH', \rtrim(\realpath(__DIR__), '\\/').'/libraries/');
\define('RAINLOOP_MB_SUPPORTED', \function_exists('mb_strtoupper'));
\spl_autoload_register(function ($sClassName) {
@ -14,6 +15,12 @@ if (!\defined('RAINLOOP_APP_ROOT_PATH'))
}
else if (0 === \strpos($sClassName, 'Sabre') && false !== \strpos($sClassName, '\\'))
{
if (!RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
{
\define('RL_MB_FIXED', true);
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
}
return include RAINLOOP_APP_LIBRARIES_PATH.'Sabre/'.\str_replace('\\', '/', \substr($sClassName, 6)).'.php';
}

2
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -201,7 +201,7 @@ Enables caching in the system'),
'ignore_folders_subscription' => array(false,
'Experimental settings. Handle with care.
'),
'sync_dav_digest_auth' => array(false),
'sync_dav_digest_auth' => array(true),
'sync_dav_domain' => array(''),
'sync_use_dav_browser' => array(true),
'allow_message_append' => array(false),

7
rainloop/v/0.0.0/app/libraries/RainLoop/SabreDAV/MbStringFix.php
View file

@ -408,8 +408,11 @@ if (!function_exists('mb_strcut'))
{
function mb_strcut($str, $start, $length = null, $encoding = '')
{
// TODO
return \MailSo\Base\Utils::Utf8Clear(substr($str, $start, $length));
$match = array();
// use the regex unicode support to separate the UTF-8 characters into an array
preg_match_all( '/./us', $str, $match );
$chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
return implode( '', $chars );
}
}

22
rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -715,8 +715,6 @@ class ServiceActions
{
try
{
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
\set_error_handler(function ($errno, $errstr, $errfile, $errline ) {
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
});
@ -741,20 +739,22 @@ class ServiceActions
$oAddressBookRoot = new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend);
$oServer = new \Sabre\DAV\Server(array(
$oPrincipalCollection, $oAddressBookRoot
));
$aTree = array($oPrincipalCollection, $oAddressBookRoot);
$this->Plugins()->RunHook('filter.sabre-dav-tree', array(&$aTree));
if (false === \strpos($this->oHttp->GetUrl(), '/index.php/dav/'))
{
$oServer->setBaseUri('/');
}
else
$oServer = new \Sabre\DAV\Server($aTree);
$sBaseUri = '/';
if (false !== \strpos($this->oHttp->GetUrl(), '/index.php/dav/'))
{
$aPath = \trim($this->oHttp->GetPath(), '/\\ ');
$oServer->setBaseUri((0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/');
$sBaseUri = (0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/';
}
$this->Plugins()->RunHook('filter.sabre-dav-base-url', array(&$sBaseUri));
$oServer->setBaseUri($sBaseUri);
// Plugins
$oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'RainLoop'));
$oServer->addPlugin(new \Sabre\CardDAV\Plugin());

4
rainloop/v/0.0.0/app/templates/Index.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html id="id-html">
<html id="id-html" class="no-js rl-booted-trigger rl-started-trigger">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@ -50,7 +50,7 @@
<div id="rl-loading-error" class="thm-loading">
An Error occurred,<br />please refresh the page and try again.
</div>
<div id="rl-content">
<div id="rl-content" class="startup-animation">
<div id="rl-popups"></div>
<div id="rl-center">
<div id="rl-top"></div>

1
rainloop/v/0.0.0/app/templates/Themes/template.less
View file

@ -40,6 +40,7 @@
.thm-body {
color: @main-color;
background-color: @main-background-color;
background-size: @main-background-size;
.thm-body-background-image(@main-background-image);
}

1
rainloop/v/0.0.0/app/templates/Themes/values.less
View file

@ -3,6 +3,7 @@
@main-color: #333;
@main-background-color: #e3e3e3;
@main-background-image: none; // "images/background.png"
@main-background-size: contain;
// LOADING
@loading-color: #000; // #ddd

4
rainloop/v/0.0.0/app/templates/Views/AdminSettingsContacts.html
View file

@ -25,9 +25,9 @@
<br />
<label data-bind="click: function () { contactsSync(!contactsSync()); }">
<i data-bind="css: contactsSync() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
Allow contacts sync (CardDAV)
Allow contacts sync (CardDAV) <span style="color:red">beta</span>
</label>
<a href="http://rainloop.net/docs/carddav/" target="_blank">read about web server configuration</a>
<a href="http://rainloop.net/docs/web-servers/" target="_blank">Web server configuration examples</a>
</div>
</div>
<br />

21
rainloop/v/0.0.0/static/css/app.css
View file

@ -8272,6 +8272,27 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
background-position: 60px 0;
}
}
html.rl-started-trigger .b-login-content .loginFormWrapper {
-webkit-transform: translateY(-30px);
-moz-transform: translateY(-30px);
transform: translateY(-30px);
}
html.rl-started-trigger #rl-content {
opacity: 0.7;
filter: alpha(opacity=70);
}
.rl-anim.csstransitions #rl-content {
-webkit-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
-moz-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
-o-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
}
.rl-anim.csstransitions .b-login-content .loginFormWrapper {
-webkit-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
-moz-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
-o-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
}
.rl-anim.rgba.cssanimations.backgroundsize .e-strip-animation {
-webkit-background-size: 60px 60px;
-moz-background-size: 60px 60px;

2
rainloop/v/0.0.0/static/css/app.min.css vendored
View file

File diff suppressed because one or more lines are too long

20
rainloop/v/0.0.0/static/js/admin.js
View file

@ -3631,11 +3631,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function ()
{
$('#rl-loading').hide();
@ -3902,6 +3897,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/
Knoin.prototype.startScreens = function (aScreensClasses)
{
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) {
var
@ -3940,6 +3939,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross);
hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
};
/**
@ -7516,8 +7523,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart();
$html.addClass('rl-started');
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
}, 50);
}

4
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

20
rainloop/v/0.0.0/static/js/app.js
View file

@ -5061,11 +5061,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function ()
{
$('#rl-loading').hide();
@ -5332,6 +5327,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/
Knoin.prototype.startScreens = function (aScreensClasses)
{
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) {
var
@ -5370,6 +5369,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross);
hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
};
/**
@ -17167,8 +17174,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart();
$html.addClass('rl-started');
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
}, 50);
}

10
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
rainloop/v/0.0.0/themes/Blurred/images/background.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

BIN
rainloop/v/0.0.0/themes/Blurred/images/preview.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

53
rainloop/v/0.0.0/themes/Blurred/styles.less Normal file
View file

@ -0,0 +1,53 @@
// MAIN
@main-color: #333;
@main-background-color: #563c55;
@main-background-image: "images/background.jpg";
@main-background-size: cover;
// LOADING
@loading-color: #ddd;
@loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
// LOGIN
@login-color: #eee;
@login-background-color: #2b333d;
@login-rgba-background-color: rgba(0,0,0,0.5);
@login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
@login-border: none;
@login-border-radius: 7px;
// MENU
@dropdown-menu-color: #333;
@dropdown-menu-background-color: #fff;
@dropdown-menu-hover-background-color: #48525C;
@dropdown-menu-hover-color: #eee;
@dropdown-menu-disable-color: #999;
// FOLDERS
@folders-color: #fff;
@folders-disabled-color: #aaa;
@folders-selected-color: #fff;
@folders-selected-background-color: #2b333d;
@folders-selected-rgba-background-color: rgba(255,255,255,0.3);
@folders-hover-color: #fff;
@folders-hover-background-color: #2b333d;
@folders-hover-rgba-background-color: rgba(255,255,255,0.3);
@folders-drop-color: #fff;
@folders-drop-background-color: #2b333d;
@folders-drop-rgba-background-color: rgba(255,255,255,0.3);
// SETTINGS
@settings-menu-color: #fff;
@settings-menu-disabled-color: #aaa;
@settings-menu-selected-color: #fff;
@settings-menu-selected-background-color: #2b333d;
@settings-menu-selected-rgba-background-color: rgba(255,255,255,0.3);
@settings-menu-hover-color: #fff;
@settings-menu-hover-background-color: #2b333d;
@settings-menu-hover-rgba-background-color: rgba(255,255,255,0.3);
// MESSAGE LIST
@message-list-toolbar-background-color: #eee;
@message-list-toolbar-gradient-start: #f4f4f4;
@message-list-toolbar-gradient-end: #dfdfdf;