Merge branch 'master' into touchdown

Conflicts:
	static/js/app.js
	static/partials/organizations.html
	test/data/test.db

static/js/app.js

@@ -913,6 +913,12 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
               return '/user';
             }
           }
+        },
+        'expiring_license': {
+          'level': 'error',
+          'message': 'Your license will expire at: {expires_at} ' +
+            '<br><br>Please contact Quay.io support to purchase a new license.',
+          'page': '/contact/'
         }
       };
 
@@ -3333,6 +3339,13 @@ quayApp.directive('billingOptions', function () {
         PlanService.unregisterListener(this);
       });
 
+      $scope.isExpiringSoon = function(cardInfo) {
+        var current = new Date();
+        var expires = new Date(cardInfo.exp_year, cardInfo.exp_month, 1);
+        var difference = expires - current;
+        return difference < (60 * 60 * 24 * 60 * 1000 /* 60 days */);
+      };
+
       $scope.changeCard = function() {
         var previousCard = $scope.currentCard;
         $scope.changingCard = true;
@@ -4815,8 +4828,8 @@ quayApp.directive('ngVisible', function () {
   };
 });
 
-quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanService', '$http', '$timeout', 'CookieService', '$anchorScroll',
-  function($location, $rootScope, Restangular, UserService, PlanService, $http, $timeout, CookieService, $anchorScroll) {
+quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanService', '$http', '$timeout', 'CookieService', 'Features', '$anchorScroll',
+  function($location, $rootScope, Restangular, UserService, PlanService, $http, $timeout, CookieService, Features, $anchorScroll) {
 
   // Handle session security.
   Restangular.setDefaultRequestParams(['post', 'put', 'remove', 'delete'], {'_csrf_token': window.__token || ''});
@@ -4830,6 +4843,11 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi
       }
     }
 
+    if (!Features.BILLING && response.status == 402) {
+      $('#overlicenseModal').modal({});
+      return false;
+    }
+
     if (response.status == 500) {
       document.location = '/500';
       return false;

static/js/controllers.js

@@ -1235,10 +1235,11 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
   fetchRepository();
 }
 
-function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams, $rootScope, $location, UserService, Config) {
+function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams, $rootScope, $location, UserService, Config, Features) {
   var namespace = $routeParams.namespace;
   var name = $routeParams.name;
 
+  $scope.Features = Features;
   $scope.permissions = {'team': [], 'user': []};
   $scope.logsShown = 0;
   $scope.deleting = false;
@@ -1644,7 +1645,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
 }
 
 function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, UserService, CookieService, KeyService,
-                       $routeParams, $http, UIService, Features) {
+                       $routeParams, $http, UIService, Features, Config) {
   $scope.Features = Features;
 
   if ($routeParams['migrate']) {
@@ -1652,11 +1653,9 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
   }
 
   UserService.updateUserIn($scope, function(user) {
-    if (!Features.GITHUB_LOGIN) { return; }
-
     $scope.cuser = jQuery.extend({}, user);
 
-    if ($scope.cuser.logins) {
+    if (Features.GITHUB_LOGIN && $scope.cuser.logins) {
       for (var i = 0; i < $scope.cuser.logins.length; i++) {
         if ($scope.cuser.logins[i].service == 'github') {
           var githubId = $scope.cuser.logins[i].service_identifier;
@@ -1749,6 +1748,8 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
   };
 
   $scope.reallyConvert = function() {
+    if (Config.AUTHENTICATION_TYPE != 'Database') { return; }
+
     $scope.loading = true;
 
     var data = {
@@ -1952,6 +1953,7 @@ function V1Ctrl($scope, $location, UserService) {
 function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService, PlanService, KeyService, Features) {
   UserService.updateUserIn($scope);
 
+  $scope.Features = Features;
   $scope.githubRedirectUri = KeyService.githubRedirectUri;
   $scope.githubClientId = KeyService.githubClientId;
 

static/js/graphing.js

@@ -139,6 +139,7 @@ ImageHistoryTree.prototype.setupOverscroll_ = function() {
 ImageHistoryTree.prototype.updateDimensions_ = function() {
   var container = this.container_;
   var dimensions = this.calculateDimensions_(container);
+  if (!dimensions) { return; }
 
   var m = dimensions.m;
   var w = dimensions.w;
@@ -909,6 +910,10 @@ function FileTreeBase() {
  */
 FileTreeBase.prototype.calculateDimensions_ = function(container) {
   var containerElm = document.getElementById(container);
+  if (!containerElm) {
+    return null;
+  }
+
   var cw = containerElm ? containerElm.clientWidth : 1200;
   var barHeight = 20;
   var ch = (this.getNodesHeight() * barHeight) + 40;
@@ -940,6 +945,7 @@ FileTreeBase.prototype.updateDimensions_ = function() {
 
   var container = this.container_;
   var dimensions = this.calculateDimensions_(container);
+  if (!dimensions) { return; }
 
   var w = dimensions.w;
   var h = dimensions.h;
@@ -989,6 +995,7 @@ FileTreeBase.prototype.draw = function(container) {
   this.container_ = container;  
   
   var dimensions = this.calculateDimensions_(container);
+  if (!dimensions) { return; }
   
   var w = dimensions.w;
   var h = dimensions.h;
@@ -1107,6 +1114,8 @@ FileTreeBase.prototype.getVisibleCount_ = function(node) {
  */
 FileTreeBase.prototype.getContainerHeight_ = function() {
   var dimensions = this.calculateDimensions_(this.container_);
+  if (!dimensions) { return; }
+
   var barHeight = this.barHeight_;
   var height = (this.getVisibleCount_(this.root_) * (barHeight + 2)); 
   return height + dimensions.m[0] + dimensions.m[2];