Stephan
d83fdb48c9
Conflicts: build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/ApplicationContext.cs src/Umbraco.Core/AsyncLock.cs src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs src/Umbraco.Core/CoreBootManager.cs src/Umbraco.Core/Logging/LogHelper.cs src/Umbraco.Core/PluginManager.cs src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs src/Umbraco.Core/TypeFinder.cs src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs src/Umbraco.Tests/ServerEnvironmentHelperTests.cs src/Umbraco.Web.UI.Client/bower.json src/Umbraco.Web.UI.Client/gruntFile.js src/Umbraco.Web.UI.Client/src/less/grid.less src/Umbraco.Web.UI.Client/src/less/panel.less src/Umbraco.Web.UI.Client/src/less/property-editors.less src/Umbraco.Web.UI.Client/src/loader.js src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/config/ClientDependency.config src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs src/Umbraco.Web/Scheduling/KeepAlive.cs src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs src/Umbraco.Web/Scheduling/LogScrubber.cs src/Umbraco.Web/Scheduling/RecurringTaskBase.cs src/Umbraco.Web/Scheduling/ScheduledPublishing.cs src/Umbraco.Web/Scheduling/ScheduledTasks.cs src/Umbraco.Web/Scheduling/Scheduler.cs src/Umbraco.Web/UI/JavaScript/JsInitialize.js src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/umbraco.presentation/content.cs src/umbraco.cms/Actions/Action.cs
40 lines
1.2 KiB
JavaScript
40 lines
1.2 KiB
JavaScript
[
|
|
'lib/jquery/jquery.min.js',
|
|
'lib/angular/1.1.5/angular.min.js',
|
|
'lib/underscore/underscore-min.js',
|
|
|
|
'lib/jquery-ui/jquery-ui.min.js',
|
|
|
|
'lib/angular/1.1.5/angular-cookies.min.js',
|
|
'lib/angular/1.1.5/angular-mobile.js',
|
|
'lib/angular/1.1.5/angular-sanitize.min.js',
|
|
|
|
'lib/angular/angular-ui-sortable.js',
|
|
|
|
'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
|
|
|
|
'lib/blueimp-load-image/load-image.all.min.js',
|
|
'lib/jquery-file-upload/jquery.fileupload.js',
|
|
'lib/jquery-file-upload/jquery.fileupload-process.js',
|
|
'lib/jquery-file-upload/jquery.fileupload-image.js',
|
|
'lib/jquery-file-upload/jquery.fileupload-angular.js',
|
|
|
|
'lib/bootstrap/js/bootstrap.2.3.2.min.js',
|
|
'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js',
|
|
'lib/umbraco/Extensions.js',
|
|
|
|
'lib/umbraco/NamespaceManager.js',
|
|
'lib/umbraco/LegacyUmbClientMgr.js',
|
|
'lib/umbraco/LegacySpeechBubble.js',
|
|
|
|
'js/app.js',
|
|
|
|
'js/umbraco.resources.js',
|
|
'js/umbraco.directives.js',
|
|
'js/umbraco.filters.js',
|
|
'js/umbraco.services.js',
|
|
'js/umbraco.security.js',
|
|
'js/umbraco.controllers.js',
|
|
'js/routes.js',
|
|
'js/init.js'
|
|
] |