Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor

2015-06-25 11:49:08 +02:00
parent fc323ae89d 693b87a527
commit 888ba8f285
201 changed files with 1348 additions and 28270 deletions
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -469,6 +469,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/*'
+                            ]
                        }
                    }
                }