Skip to content

Commit

Permalink
Merge pull request #230 from mwaylabs/feature/remove-file-include
Browse files Browse the repository at this point in the history
Remove angular sanitize from file include
  • Loading branch information
Yasin Abdelmonem authored Oct 25, 2018
2 parents 7da95a2 + e195686 commit bef0b8b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
10 changes: 6 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> (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"
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
"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 <[email protected]> (http://relution.io)",
"version": "1.24.2",
"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",
Expand Down

0 comments on commit bef0b8b

Please sign in to comment.