Skip to content

Commit

Permalink
1.52.425
Browse files Browse the repository at this point in the history
  • Loading branch information
ranle committed Jul 4, 2017
1 parent 05f7b71 commit bfe090f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Luminati Proxy manager - Change Log

## 1.52.425
- :bug: fix google login

## 1.52.369
- :bug: fix upgrade modal

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This tool requires a [Luminati](https://luminati.io/?cam=github-proxy) account.
### Requirements
Software requirements for Luminati proxy manager are:

- <a href="https://git-scm.com/downloads">Git</a> from version 1.7+
- <a href="https://git-scm.com/downloads/">Git</a> from version 1.7+
- <a href="https://nodejs.org/en/download/">Node.js</a> from version 6+

### Windows
Expand Down
8 changes: 4 additions & 4 deletions bin/pub/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ function Resolve($scope, $http, $window){

module.controller('settings', Settings);
Settings.$inject = ['$scope', '$http', '$window', '$sce', '$rootScope',
'$state'];
function Settings($scope, $http, $window, $sce, $rootScope, $state){
'$state', '$location'];
function Settings($scope, $http, $window, $sce, $rootScope, $state, $location){
var update_error = function(){
if ($rootScope.relogin_required)
return $scope.user_error = {message: 'Please log in again.'};
Expand Down Expand Up @@ -618,8 +618,8 @@ function Settings($scope, $http, $window, $sce, $rootScope, $state){
google.attr('href', google.attr('href')+'&state='+encodeURIComponent(
l.protocol+'//'+l.hostname+':'+(l.port||80)+'?api_version=3'));
};
var m, qs_regex = /\&t=([a-zA-Z0-9\+\/=]+)$/;
if (m = $window.location.search.match(qs_regex))
var m, qs_regex = /^([a-zA-Z0-9\+\/=]+)$/;
if (m = ($location.search().t||'').replace(/\s+/g, '+').match(qs_regex))
{
$scope.google_login = true;
token = m[1];
Expand Down
2 changes: 1 addition & 1 deletion lib/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ E.prototype.check_upgrade = etask._fn(function*(_this){
});

E.prototype.start_auto_update = function(){
let cb, tm = 1*date.ms.MIN;
let cb, tm = 10*date.ms.MIN;
setTimeout(cb = etask._fn(function*(_this){
const v = yield _this._last_version();
if (v.newer && v.auto_update)
Expand Down
2 changes: 1 addition & 1 deletion lib/swagger.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "1.52.369",
"version": "1.52.425",
"title": "Luminati Proxy Manager",
"license": {
"name": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"test": "./node_modules/mocha/bin/mocha",
"test-win": "node node_modules/mocha/bin/mocha"
},
"version": "1.52.369",
"version": "1.52.425",
"lpm": {
"files": [
"bin/ca.crt",
Expand Down Expand Up @@ -185,6 +185,6 @@
"lib/username.js",
"test.js"
],
"md5": "f226f7fa6565976f7a31019c91e16414"
"md5": "a902207bd10f140ee37b8af23b90b3cb"
}
}

0 comments on commit bfe090f

Please sign in to comment.