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

Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor

Browse Source 
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/less/property-editors.less
This commit is contained in:
Shannon
2015-06-25 10:16:35 +02:00
parent 9c8489c4c5 a85f3bfc16
commit fc7932c2bf
199 changed files with 1345 additions and 28267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,6 +454,22 @@ module.exports = function (grunt) {
'ng-file-upload': {
keepExpandedHierarchy: false,
files: ['angular-file-upload.min.js']
},
'codemirror': {
files: [
'lib/codemirror.js',
'lib/codemirror.css',
'mode/css/*',
'mode/javascript/*',
'mode/xml/*',
'mode/htmlmixed/*',
'addon/search/*',
'addon/edit/*',
'addon/selection/*',
'addon/dialog/*'
]
}
}
}