From 0a72a5072424edaf39a47b02a700c4ed13f4ff81 Mon Sep 17 00:00:00 2001 From: Zarlex Date: Tue, 16 Oct 2018 11:48:14 +0200 Subject: [PATCH 1/2] Remove angular sanitize from file include --- CHANGELOG.md | 4 ++++ Gruntfile.js | 1 - package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f398517e..bc5a1162 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.24.3 +## Bug Fixes +- Remove angular sanitize from file include in mwUI.Relution to provide angular 1.5 support + # v1.24.2 ## Features - Add `is-visible` attribute to mw-menu-entry to hide menu entries without removing them from the dom. diff --git a/Gruntfile.js b/Gruntfile.js index 7be47f0d..4671f9b1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,7 +61,6 @@ module.exports = function (grunt) { '!src-relution/test/**/*.js', '.tmp/templates-relution.js', '.tmp/templates-relution-i18n.js', - 'libs/angular-sanitize/angular-sanitize.js', 'libs/showdown/dist/showdown.js', 'libs/jquery-ui/ui/widget.js', 'libs/blueimp-file-upload/js/jquery.fileupload.js', diff --git a/package.json b/package.json index c260e08a..29b986c9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mw-uikit", "description": "A toolbox to build portals with AngularJS 1.5.x that have a lot of forms and list views for example admin portals to manage data.", "author": "Alexander Zarges (http://relution.io)", - "version": "1.24.2", + "version": "1.24.3", "license": "Apache-2.0", "devDependencies": { "angular": "1.7.3", From e195686bc869359ee4765aba465a512de3366baa Mon Sep 17 00:00:00 2001 From: Zarlex Date: Tue, 16 Oct 2018 17:21:46 +0200 Subject: [PATCH 2/2] Define dependencies that are needed for uikit.relution --- bower.json | 10 ++++++---- package.json | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 5632f246..7cfc24a7 100644 --- a/bower.json +++ b/bower.json @@ -2,16 +2,18 @@ "name": "mw-uikit", "description": "A toolbox to build portals with AngularJS 1.5.x that have a lot of forms and list views for example admin portals to manage data.", "author": "Alexander Zarges (http://relution.io)", - "devDependencies": { - "angular": "1.7.3", - "angular-sanitize": "1.7.3", - "angular-markdown-directive": "0.3.1", + "dependencies": { "showdown": "1.2.3", "jquery": "3.1.0", "jquery-ui": "1.12.1", "blueimp-file-upload": "9.22.0", "bootstrap-sass-datepicker": "1.3.7" }, + "devDependencies": { + "angular": "1.7.3", + "angular-sanitize": "1.7.3", + "angular-markdown-directive": "0.3.1" + }, "repository": { "type": "git", "url": "https://github.com/mwaylabs/uikit.git" diff --git a/package.json b/package.json index 29b986c9..7ef95cc1 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,12 @@ "author": "Alexander Zarges (http://relution.io)", "version": "1.24.3", "license": "Apache-2.0", + "dependencies": { + "showdown": "1.2.3", + "jquery": "3.1.0", + "jquery-ui": "1.12.1", + "blueimp-file-upload": "9.22.0" + }, "devDependencies": { "angular": "1.7.3", "angular-mocks": "1.7.3",