Merge branch 'js'

bower.json

@@ -6,10 +6,10 @@
     "angular-sanitize": "~1.5.0",
     "angular-ui-router": "~0.2.15",
     "angular": "~1.5.0",
-    "lodash": "~4.5.0",
+    "lodash": "~4.6.1",
     "angular-gettext": "~2.2.1",
     "font-awesome": "~4.5.0",
-    "angular-bootstrap": "~1.1.2",
+    "angular-bootstrap": "~1.2.4",
     "bootstrap-sass": "~3.3.6"
   },
   "devDependencies": {

gulp/scripts.js

@@ -20,6 +20,6 @@ gulp.task('scripts', ['typescript'], function() {
     .on('error', noop) // don't stop on error
     .pipe(stylish.combineWithHintResults()) // combine results
     .pipe($.jshint.reporter('jshint-stylish')) // reporter
-    .pipe(browserSync.reload({stream: true}))
+    .pipe(browserSync.stream())
     .pipe($.size()); // Display the size
 });

gulp/styles.js

@@ -6,9 +6,7 @@ var conf = require('../gulpfile.config');
 
 var browserSync = require('browser-sync');
 
-var $ = require('gulp-load-plugins')({
-  pattern: ['gulp-*', 'main-bower-files']
-});
+var $ = require('gulp-load-plugins')();
 
 var wiredep = require('wiredep').stream;
 var _ = require('lodash');
@@ -43,5 +41,5 @@ gulp.task('styles', ['fonts'], function() {
     .pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer'))
     .pipe($.sourcemaps.write())
     .pipe(gulp.dest(path.join(conf.paths.tmp, '/css/')))
-    .pipe(browserSync.reload({stream: true}));
+    .pipe(browserSync.stream());
 });

gulp/typescript.js

@@ -10,9 +10,8 @@ var tsProject = $.typescript.createProject('tsconfig.json', {sortOutput: true});
 
 gulp.task('typescript', function() {
   return gulp.src([
-      path.join(conf.paths.src, '/main/main.module.ts'),
-      path.join(conf.paths.src, '/modules/**/*.ts'),
-      path.join(conf.paths.src, '/main/*.ts')
+      path.join(conf.paths.src, '/main/**/*.ts'),
+      path.join(conf.paths.src, '/modules/**/*.ts')
     ])
     .pipe($.sourcemaps.init())
     .pipe($.tslint())
@@ -25,6 +24,6 @@ gulp.task('typescript', function() {
       sourceRoot: '../'
     }))
     .pipe(gulp.dest(path.join(conf.paths.tmp)))
-    .pipe(browserSync.reload({stream: true}))
+    .pipe(browserSync.stream())
     .pipe($.size());
 });

package.json

@@ -26,7 +26,7 @@
     "gulp-cache": "~0.4.2",
     "gulp-clean-css": "^2.0.3",
     "gulp-concat": "~2.6.0",
-    "gulp-filter": "~3.0.1",
+    "gulp-filter": "^3.0.1",
     "gulp-flatten": "~0.2.0",
     "gulp-htmlmin": "^1.3.0",
     "gulp-if": "^2.0.0",
@@ -36,44 +36,44 @@
     "gulp-jscs-stylish": "~1.3.0",
     "gulp-jshint": "^2.0.0",
     "gulp-load-plugins": "~1.2.0",
-    "gulp-ng-annotate": "~1.1.0",
+    "gulp-ng-annotate": "^2.0.0",
     "gulp-protractor": "~2.1.0",
     "gulp-rename": "~1.2.2",
     "gulp-replace": "~0.5.4",
     "gulp-rev": "~7.0.0",
     "gulp-rev-replace": "~0.4.3",
     "gulp-sass": "^2.2.0",
     "gulp-shell": "~0.5.2",
-    "gulp-size": "~2.0.0",
+    "gulp-size": "^2.1.0",
     "gulp-sourcemaps": "~1.6.0",
     "gulp-tsd": "0.1.0",
-    "gulp-tslint": "^4.3.2",
-    "gulp-typescript": "~2.11.0",
-    "gulp-uglify": "~1.5.2",
+    "gulp-tslint": "^4.3.3",
+    "gulp-typescript": "^2.12.1",
+    "gulp-uglify": "^1.5.3",
     "gulp-useref": "^2.1.0",
     "gulp-util": "~3.0.7",
-    "http-proxy-middleware": "^0.10.0",
+    "http-proxy-middleware": "^0.11.0",
     "https-proxy-agent": "^1.0.0",
     "jasmine-spec-reporter": "^2.4.0",
     "jshint": "^2.9.1",
     "jshint-stylish": "~2.1.0",
-    "karma": "~0.13.21",
+    "karma": "^0.13.22",
     "karma-angular-filesort": "~1.0.1",
     "karma-chrome-launcher": "~0.2.2",
-    "karma-coverage": "0.5.3",
+    "karma-coverage": "^0.5.5",
     "karma-jasmine": "~0.3.7",
-    "karma-junit-reporter": "^0.3.8",
+    "karma-junit-reporter": "^0.4.0",
     "karma-ng-html2js-preprocessor": "~0.2.1",
     "karma-phantomjs-launcher": "~1.0.0",
-    "lodash": "^4.5.0",
+    "lodash": "^4.6.1",
     "main-bower-files": "~2.11.1",
     "merge-stream": "~1.0.0",
-    "phantomjs-prebuilt": "^2.1.4",
+    "phantomjs-prebuilt": "^2.1.5",
     "protractor-html-screenshot-reporter": "0.0.21",
     "require-dir": "~0.3.0",
     "tsd": "~0.6.5",
-    "tslint": "^3.3.0",
-    "typescript": "~1.7.5",
+    "tslint": "^3.5.0",
+    "typescript": "^1.8.7",
     "uglify-save-license": "~0.4.1",
     "wiredep": "~3.0.0",
     "wrench": "~1.5.8"

sources/libraries/angular-bootstrap/.bower.json

@@ -11,21 +11,21 @@
   "license": "MIT",
   "ignore": [],
   "description": "Native AngularJS (Angular) directives for Bootstrap.",
-  "version": "1.1.2",
+  "version": "1.2.4",
   "main": [
     "./ui-bootstrap-tpls.js"
   ],
   "dependencies": {
     "angular": ">=1.4.0"
   },
   "homepage": "https://github.com/angular-ui/bootstrap-bower",
-  "_release": "1.1.2",
+  "_release": "1.2.4",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.2",
-    "commit": "189241b8981b48a353ebc8161a597ffc144e712d"
+    "tag": "1.2.4",
+    "commit": "f8a2ccbdcec7688a7482ed55b5665df7e0c0e5b9"
   },
   "_source": "https://github.com/angular-ui/bootstrap-bower.git",
-  "_target": "~1.1.2",
+  "_target": "~1.2.4",
   "_originalSource": "angular-bootstrap"
 }

sources/libraries/angular-bootstrap/bower.json

@@ -11,7 +11,7 @@
     "license": "MIT",
     "ignore": [],
     "description": "Native AngularJS (Angular) directives for Bootstrap.",
-    "version": "1.1.2",
+    "version": "1.2.4",
     "main": ["./ui-bootstrap-tpls.js"],
     "dependencies": {
         "angular": ">=1.4.0"

sources/libraries/angular-bootstrap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-bootstrap",
-  "version": "1.1.2",
+  "version": "1.2.4",
   "description": "Bootstrap widgets for Angular",
   "main": "index.js",
   "homepage": "http://angular-ui.github.io/bootstrap/",

sources/libraries/angular-bootstrap/ui-bootstrap-csp.css

@@ -4,6 +4,21 @@
   -webkit-transition: 0s ease-in-out left;
   transition: 0s ease-in-out left
 }
+.uib-position-measure {
+  display: block !important;
+  visibility: hidden !important;
+  position: absolute !important;
+  top: -9999px !important;
+  left: -9999px !important;
+}
+
+.uib-position-scrollbar-measure {
+  position: absolute;
+  top: -9999px;
+  width: 50px;
+  height: 50px;
+  overflow: scroll;
+}
 .uib-datepicker .uib-title {
   width: 100%;
 }
@@ -14,12 +29,45 @@
 
 .uib-datepicker-popup.dropdown-menu {
   display: block;
+  float: none;
+  margin: 0;
 }
 
 .uib-button-bar {
   padding: 10px 9px 2px;
 }
 
+.uib-left, .uib-right {
+  width: 100%
+}
+
+[uib-tooltip-popup].tooltip.top-left > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.top-right > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.bottom-left > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.bottom-right > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.left-top > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.left-bottom > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.right-top > .tooltip-arrow,
+[uib-tooltip-popup].tooltip.right-bottom > .tooltip-arrow,
+[uib-popover-popup].popover.top-left > .arrow,
+[uib-popover-popup].popover.top-right > .arrow,
+[uib-popover-popup].popover.bottom-left > .arrow,
+[uib-popover-popup].popover.bottom-right > .arrow,
+[uib-popover-popup].popover.left-top > .arrow,
+[uib-popover-popup].popover.left-bottom > .arrow,
+[uib-popover-popup].popover.right-top > .arrow,
+[uib-popover-popup].popover.right-bottom > .arrow {
+  top: auto;
+  bottom: auto;
+  left: auto;
+  right: auto;
+  margin: 0;
+}
+
+[uib-popover-popup].popover, [uib-popover-template-popup].popover {
+  display: block !important;
+}
+
 .uib-time input {
   width: 50px;
 }