the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-06-06 01:55:48 +04:00
parent eff7c17866
commit 187e44607d
6 changed files with 70 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gruntfile.js
View file

@ -443,7 +443,6 @@ module.exports = function (grunt) {
require('wrench').copyDirSyncRecursive('rainloop/v/' + devVersion,
dist + 'rainloop/v/' + versionFull, {'forceDelete': true});
grunt.file.write(dist + 'data/VERSION', versionFull);
grunt.file.write(dist + 'data/EMPTY', versionFull);
grunt.file.write(dist + 'index.php',

8
dev/Admin/Licensing.js
View file

@ -48,6 +48,10 @@ AdminLicensing.prototype.showActivationForm = function ()
*/
AdminLicensing.prototype.licenseExpiredMomentValue = function ()
{
var oDate = moment.unix(this.licenseExpired());
return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
var
iTime = this.licenseExpired(),
oDate = moment.unix(iTime)
;
return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
};

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.6.7",
"release": "126",
"release": "127",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "Gruntfile.js",

3
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -796,7 +796,8 @@ class Actions
$oHttp->GetMethod().': '.$oHttp->GetHost(false, false).$oHttp->GetServer('REQUEST_URI', ''),
\MailSo\Log\Enumerations\Type::NOTE, 'REQUEST');
$this->oLogger->Write('[PHP:'.PHP_VERSION.'][RL:'.APP_VERSION.'][DATE:'.\gmdate('d.m.y').'][IP:'.$oHttp->GetClientIp().']');
$this->oLogger->Write('[PHP:'.PHP_VERSION.'][RL:'.APP_VERSION.'][DATE:'.\gmdate('d.m.y').'][IP:'.
$oHttp->GetClientIp().'][PID:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? \getmypid() : 'unknown').']');
}
}

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

@ -6947,8 +6947,12 @@ AdminLicensing.prototype.showActivationForm = function ()
*/
AdminLicensing.prototype.licenseExpiredMomentValue = function ()
{
var oDate = moment.unix(this.licenseExpired());
return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
var
iTime = this.licenseExpired(),
oDate = moment.unix(iTime)
;
return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
};
/**
* @constructor

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

File diff suppressed because one or more lines are too long