yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2015-08-04 17:10:58 +02:00
parent c1db51c62e 3fec2b9756
commit 85534bc3ce
342 changed files with 6685 additions and 4199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/gruntFile.js
View File

@@ -433,7 +433,8 @@ module.exports = function (grunt) {
ignorePackages: ['bootstrap'],
packageSpecific: {
'typeahead.js': {
keepExpandedHierarchy: false
keepExpandedHierarchy: false,
files: ['dist/typeahead.bundle.min.js']
},
'underscore': {
files: ['underscore-min.js', 'underscore-min.map']
@@ -462,10 +463,7 @@ module.exports = function (grunt) {
},
'angular-dynamic-locale': {
files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
},
'bootstrap-tabdrop': {
keepExpandedHierarchy: false
},
},
'ng-file-upload': {
keepExpandedHierarchy: false,
files: ['angular-file-upload.min.js']