Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit c8148d1

Browse files
committed
Merge pull request #2 from RainLoop/master
update - 2015-08-06
2 parents 1958f32 + e7f416b commit c8148d1

File tree

574 files changed

+48485
-45036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

574 files changed

+48485
-45036
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
/.idea
2+
/api.php
23
/error.log
34
/nbproject
45
/npm-debug.log
56
/rainloop.sublime-project
67
/rainloop.sublime-workspace
8+
/rainloop/v/0.0.0/static/fonts/*
9+
!/rainloop/v/0.0.0/static/fonts/.gitempty
10+
/rainloop/v/0.0.0/static/svg/*
11+
!/rainloop/v/0.0.0/static/svg/.gitempty
712
/rainloop/v/0.0.0/static/css/*.css
8-
/rainloop/v/0.0.0/static/js/*.js
913
/rainloop/v/0.0.0/static/js/**/*.js
1014
/node_modules
1115
/build/local

.jshintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"jquery" : true,
5252

5353
"globals": {
54+
"RL_COMMUNITY" : true,
5455
"module" : true,
5556
"require" : true,
5657
"ko" : true,

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Thanks for contributing to RainLoop Webmail!
2+
3+
1. Sign the CLA (individual or corporate) at <http://www.rainloop.net/contribute/>.
4+
2. Fork the repo, do work in a feature branch.
5+
3. Issue a pull request.
6+
7+
If you have any questions, open an issue or email [support@rainloop.net](mailto:support@rainloop.net).

LICENSE

Lines changed: 653 additions & 17 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
RainLoop Webmail
22
==================
33

4-
[![Join the chat at https://gitter.im/RainLoop/rainloop-webmail](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/RainLoop/rainloop-webmail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5-
64
Simple, modern &amp; fast web-based email client.
75

86
Modest system requirements, decent performance, simple installation and upgrade, no database required - all these make RainLoop Webmail a perfect choice for your email solution.
97

10-
For more information about the product, check [http://rainloop.net](http://rainloop.net).
8+
For more information about the product, check [rainloop.net](http://www.rainloop.net/).
119

12-
Information about installing the product, check the [documentation page](http://rainloop.net/docs/installation/).
10+
Information about installing the product, check the [documentation page](http://www.rainloop.net/docs/installation/).
1311

1412
## Attention
1513

@@ -18,7 +16,8 @@ It's not recommended to use in production environment.
1816

1917
## License
2018

21-
**Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)**
22-
http://creativecommons.org/licenses/by-nc-sa/3.0/
19+
**RainLoop Webmail (Community edition)** is released under
20+
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
21+
http://www.gnu.org/licenses/agpl-3.0.html
2322

2423
Copyright (c) 2015 Rainloop Team

_include.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ function __get_custom_data_full_path()
1010
return '';
1111
return '/var/external-rainloop-data-folder/'; // custom data folder path
1212
}
13+
14+
/**
15+
* @return string
16+
*/
17+
function __get_additional_configuration_name()
18+
{
19+
return '';
20+
return defined('APP_SITE') && 0 < strlen(APP_SITE) ? APP_SITE.'.ini' : ''; // additional configuration file name
21+
}

build/langs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function saveLangStructure($sLangFile, $aLang)
4848
}
4949
}
5050

51-
\file_put_contents(LANGS_PATH.'/'.$sLangFile, implode("\n", $aResultLines));
51+
\file_put_contents(LANGS_PATH.'/'.$sLangFile, implode("\n", $aResultLines)."\n");
5252
}
5353

5454
$sNL = "\n";

build/owncloud/rainloop-app/appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<name>RainLoop</name>
55
<description>Simple, modern and fast web-based email client.</description>
66
<version>0.0</version>
7-
<licence>CC BY-NC-SA 3.0</licence>
7+
<licence></licence>
88
<author>RainLoop Team</author>
99
<require>6.0</require>
1010
<dependencies>

build/test.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
// simple connection test
4+
5+
$host = 'imap.gmail.com';
6+
$port = 993;
7+
8+
echo $host.':'.$port;
9+
10+
$errorStr = '';
11+
$errorNo = 0;
12+
13+
$connection = stream_socket_client($host.':'.$port, $errorNo, $errorStr, 5, STREAM_CLIENT_CONNECT);
14+
if (is_resource($connection)) {
15+
echo ' = OK';
16+
fclose($connection);
17+
} else {
18+
echo ' = ERROR ([#'.$errorNo.'] '.$errorStr.')';
19+
}

dev/App/Abstract.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,20 @@
202202
}
203203
};
204204

205+
/**
206+
* @param {string} sKey
207+
*/
208+
AbstractApp.prototype.setClientSideToken = function (sKey)
209+
{
210+
if (window.__rlah_set)
211+
{
212+
window.__rlah_set(sKey);
213+
214+
require('Storage/Settings').settingsSet('AuthAccountHash', sKey);
215+
require('Common/Links').populateAuthSuffix();
216+
}
217+
};
218+
205219
/**
206220
* @param {boolean=} bAdmin = false
207221
* @param {boolean=} bLogout = false
@@ -269,6 +283,8 @@
269283

270284
AbstractApp.prototype.bootstart = function ()
271285
{
286+
Utils.log('Ps' + 'ss, hac' + 'kers! The' + 're\'s not' + 'hing inte' + 'resting :' + ')');
287+
272288
Events.pub('rl.bootstart');
273289

274290
var
@@ -279,19 +295,23 @@
279295
ko.components.register('SaveTrigger', require('Component/SaveTrigger'));
280296
ko.components.register('Input', require('Component/Input'));
281297
ko.components.register('Select', require('Component/Select'));
282-
ko.components.register('TextArea', require('Component/TextArea'));
283298
ko.components.register('Radio', require('Component/Radio'));
299+
ko.components.register('TextArea', require('Component/TextArea'));
284300

285301
ko.components.register('x-script', require('Component/Script'));
302+
ko.components.register('svg-icon', require('Component/SvgIcon'));
286303

287-
if (Settings.settingsGet('MaterialDesign') && Globals.bAnimationSupported)
304+
if (/**false && /**/Settings.settingsGet('MaterialDesign') && Globals.bAnimationSupported)
288305
{
289306
ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox'));
307+
ko.components.register('CheckboxSimple', require('Component/Checkbox'));
290308
}
291309
else
292310
{
293311
// ko.components.register('Checkbox', require('Component/Classic/Checkbox'));
312+
// ko.components.register('CheckboxSimple', require('Component/Classic/Checkbox'));
294313
ko.components.register('Checkbox', require('Component/Checkbox'));
314+
ko.components.register('CheckboxSimple', require('Component/Checkbox'));
295315
}
296316

297317
Translator.initOnStartOrLangChange(Translator.initNotificationLanguage, Translator);
@@ -358,6 +378,11 @@
358378
Globals.$html.toggleClass('rl-left-panel-disabled', bValue);
359379
});
360380

381+
Globals.leftPanelType.subscribe(function (sValue) {
382+
Globals.$html.toggleClass('rl-left-panel-none', 'none' === sValue);
383+
Globals.$html.toggleClass('rl-left-panel-short', 'short' === sValue);
384+
});
385+
361386
ssm.ready();
362387

363388
require('Stores/Language').populate();

0 commit comments

Comments
 (0)