Merge 5323475 into a875343

Makefile

@@ -25,6 +25,7 @@ build: clean
 	--exclude=$(project_dir)/js/app \
 	--exclude=$(project_dir)/js/config \
 	--exclude=$(project_dir)/tests \
+	--exclude=$(project_dir)/.editorconfig \
 	--exclude=$(project_dir)/.idea \
 	--exclude=$(project_dir)/.gitignore \
 	--exclude=$(project_dir)/.scrutinizer.yml \
@@ -41,18 +42,31 @@ build: clean
 	--exclude=$(project_dir)/js/Gruntfile.js \
 	--exclude=$(project_dir)/js/package.json \
 	--exclude=$(project_dir)/js/node_modules \
+	--exclude=$(project_dir)/js/.stylelintrc \
 	--exclude=$(project_dir)/js/vendor/**/.bower.json \
 	--exclude=$(project_dir)/js/vendor/**/.npmignore \
 	--exclude=$(project_dir)/js/vendor/**/bower.json \
 	--exclude=$(project_dir)/js/vendor/**/Gruntfile.js \
 	--exclude=$(project_dir)/js/vendor/**/package.json \
 	--exclude=$(project_dir)/js/vendor/**/*.md \
 	--exclude=$(project_dir)/js/vendor/**/karma.conf.js \
+	--exclude=$(project_dir)/js/vendor/angular/angular-csp.css \
+	--exclude=$(project_dir)/js/vendor/angular/angular.min.js \
+	--exclude=$(project_dir)/js/vendor/angular/angular.min.js.gzip \
+	--exclude=$(project_dir)/js/vendor/angular/angular.min.js.map \
+	--exclude=$(project_dir)/js/vendor/angular-bootstrap/index.js \
+	--exclude=$(project_dir)/js/vendor/angular-bootstrap/ui-bootstrap-csp.css \
+	--exclude=$(project_dir)/js/vendor/angular-bootstrap/ui-bootstrap-tpls.min.js \
+	--exclude=$(project_dir)/js/vendor/angular-bootstrap/ui-bootstrap.min.js \
 	--exclude=$(project_dir)/js/vendor/angular-mocks \
 	--exclude=$(project_dir)/js/vendor/davclient.js/index.html \
+	--exclude=$(project_dir)/js/vendor/fullcalendar/dist/fullcalendar.min.css \
+	--exclude=$(project_dir)/js/vendor/fullcalendar/dist/fullcalendar.min.js \
 	--exclude=$(project_dir)/js/vendor/fullcalendar/dist/gcal.js \
-	--exclude=$(project_dir)/js/vendor/fullcalendar/dist/lang \
+	--exclude=$(project_dir)/js/vendor/fullcalendar/dist/locale \
 	--exclude=$(project_dir)/js/vendor/ical.js/build/benchmark \
+	--exclude=$(project_dir)/js/vendor/ical.js/build/ical.min.js \
+	--exclude=$(project_dir)/js/vendor/ical.js/build/ical.min.js.map \
 	--exclude=$(project_dir)/js/vendor/ical.js/lib \
 	--exclude=$(project_dir)/js/vendor/ical.js/samples \
 	--exclude=$(project_dir)/js/vendor/ical.js/sandbox \
@@ -65,6 +79,7 @@ build: clean
 	--exclude=$(project_dir)/js/vendor/jquery-timepicker/legacy_1.2.6 \
 	--exclude=$(project_dir)/js/vendor/jquery-timepicker/tests \
 	--exclude=$(project_dir)/js/vendor/jquery-timepicker/index.html \
+	--exclude=$(project_dir)/js/vendor/jstzdetect/jstz.min.js \
 	--exclude=$(project_dir)/timezones/INFO.md \
 
 appstore: build

js/vendor/angular-bootstrap/.bower.json

@@ -11,19 +11,19 @@
   "license": "MIT",
   "ignore": [],
   "description": "Native AngularJS (Angular) directives for Bootstrap.",
-  "version": "1.3.3",
+  "version": "2.1.3",
   "main": [
     "./ui-bootstrap-tpls.js"
   ],
   "dependencies": {
     "angular": ">=1.4.0"
   },
   "homepage": "https://github.com/angular-ui/bootstrap-bower",
-  "_release": "1.3.3",
+  "_release": "2.1.3",
   "_resolution": {
     "type": "version",
-    "tag": "1.3.3",
-    "commit": "d45246707f5bf9533e3824861a29abd36757db45"
+    "tag": "2.1.3",
+    "commit": "bebb038e4a2896944356f79dde55f961a403f45d"
   },
   "_source": "https://github.com/angular-ui/bootstrap-bower.git",
   "_target": "*",

js/vendor/angular-bootstrap/bower.json

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

js/vendor/angular-bootstrap/package.json

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