c6a9701e53
Merge branch temp8 into temp8-di2690
2018-12-05 09:05:47 +01:00
e5d12117d5
Composition can set default renderMvc controller
2018-12-05 08:19:21 +01:00
73f31dd800
Refactor manifest dashboards, security
2018-12-04 11:37:07 +01:00
b361d1c950
Refactor package.manifest dashboards JSON structure
2018-12-03 14:26:16 +00:00
a5b331f6d7
Gets site running with dashboards
2018-12-03 16:40:28 +11:00
162b90194d
Gets sln building, removes old legacy settings, removes ascx dashboard support
2018-12-03 16:14:49 +11:00
953f37f2db
Merge remote-tracking branch 'umbraco/temp8' into U4-2827
...
# Conflicts:
# src/Umbraco.Core/Manifest/ManifestBuilder.cs
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Core/Manifest/PackageManifest.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/SectionController.cs
2018-12-03 15:25:31 +11:00
2c2873492f
Fix merge
2018-11-29 12:48:13 +01:00
146bbcec4b
Merge branch temp8 into temp8-di2690
2018-11-29 12:38:44 +01:00
eb0d2464aa
Minor fixes
2018-11-29 12:27:16 +01:00
c6891c6c70
RegisterUnique
2018-11-29 10:35:16 +01:00
ec3fd890ec
Merge pull request #3761 from kjac/v8-fix-move-copy-status-type-ysod
...
V8: Fix YSODs when moving and copying things in the Settings section
2018-11-28 21:45:15 +01:00
e9de6c1fc9
Naming is hard
2018-11-28 17:35:12 +01:00
e42f140a2c
Cleanup
2018-11-28 16:57:01 +01:00
f9a19ada04
IContainer.die.die.die
2018-11-28 12:59:40 +01:00
49a0b68b28
IContainer is IRegister+IFactory
2018-11-28 11:05:41 +01:00
80f3fc6864
Get rid of IContainer.GetRegistered
2018-11-27 15:20:26 +01:00
de8dbe0041
Cleanup
2018-11-27 15:17:26 +01:00
b365539368
Optimize
2018-11-27 15:15:44 +01:00
5d167b49a4
More composition fixes
2018-11-27 15:09:08 +01:00
c23c7749b4
Composition fixes
2018-11-27 14:04:08 +01:00
7c5f5e873d
Merge pull request #3621 from umbraco/temp8-controllers
...
Refactor/fix registering controllers
2018-11-27 10:18:28 +00:00
e47566ca4e
Fix build
2018-11-27 10:49:41 +01:00
5b111f9629
More composition simplification
2018-11-27 10:37:33 +01:00
3f75274283
Merge pull request #3766 from umbraco/temp8-remove-bootstrap-slider
...
Temp8 remove bootstrap slider
2018-11-27 09:51:08 +01:00
13f6469590
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-11-27 09:45:07 +01:00
d2a474f6ff
ContentService should remain public for now
2018-11-27 09:44:08 +01:00
b8608f1b2e
Refactor runtimes, injection and composition
2018-11-26 16:54:32 +01:00
58b1c9e9fb
Update Serilog.Settings.AppSettings Nupkg reference from 2.1.2 to 2.2.2 in Umbraco.Core
2018-11-26 15:03:39 +00:00
6257416c4a
remove a bunch of slider prevalues.
2018-11-26 11:38:15 +01:00
fee968b94e
Make MoveOperationStatusType of underlying type byte to fix move and copy YSODs
2018-11-26 08:19:49 +01:00
8b74453c13
Simplify IContainer.CreateInstance
2018-11-24 16:41:27 +01:00
392c9ed83b
More filesystem DI fixes
2018-11-24 15:38:00 +01:00
ce47eae85b
Various fixes
2018-11-23 16:19:03 +01:00
6ffc340725
Merge branch temp8 into temp8-di2690
2018-11-23 14:58:08 +01:00
57074d3545
some code cleanup
2018-11-22 15:26:10 +11:00
9e7384a330
Merge branch 'temp8' into temp8-3096-angular-bulk-publish
...
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
2018-11-20 19:37:39 +11:00
d2a61e5b9c
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
2018-11-20 19:31:08 +11:00
8aaa75778e
Cleanup
2018-11-20 08:35:28 +01:00
e6718c6989
more manual merging
2018-11-20 17:44:24 +11:00
b4c2c8bd74
manually merging
2018-11-20 14:11:35 +11:00
b69cbf0c53
Remove RegisterOrdered requirement from IContainer
2018-11-19 15:10:35 +01:00
199e09c789
Remove named services support requirement from IContainer
2018-11-19 14:52:55 +01:00
87a64b7406
Refactor filesystems (again)
2018-11-19 14:40:59 +01:00
8a809fe97a
Pushing crash handling on app domain into CoreRuntime
2018-11-19 22:02:51 +11:00
bcf542506d
setting up more of the core in CoreRuntime, this time the logger and Umbraco Core
2018-11-19 22:00:50 +11:00
71026d6d15
Fixes 3713
...
Moved the UmbracoApplicationBase from Core to Web
Moved the WebProfiler from Core to Web
Removed UmbracoApplicationBase from the CoreRuntime, it's still in the WebRuntime (and registered there in DI)
2018-11-19 21:23:08 +11:00
99d9c49c9f
Gets sln building and manually merges the entity/media service changes
2018-11-19 17:54:36 +11:00
c3736ce7ab
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# .github/README.md
# build.bat
# src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
# src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
# src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
# src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
# src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IMediaService.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Core/Services/NotificationService.cs
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
# src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
# src/Umbraco.Web.UI.Client/src/less/main.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/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
# src/Umbraco.Web.UI.Client/src/views/content/copy.html
# src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
# src/Umbraco.Web.UI.Client/src/views/content/move.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
# src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/es.xml
# src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Editors/ContentControllerBase.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/PasswordChanger.cs
# src/Umbraco.Web/HttpRequestExtensions.cs
# src/Umbraco.Web/Models/ContentEditing/Tab.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/Templates/TemplateRenderer.cs
# src/Umbraco.Web/Trees/ApplicationTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/_Legacy/Controls/TabView.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
# src/umbraco.cms/Actions/Action.cs
# src/umbraco.providers/members/UmbracoMembershipProvider.cs
2018-11-19 15:32:26 +11:00
3960791bf2
Simplify CollectionBuilderBase, no more named services
2018-11-18 11:05:39 +01:00
Stephan