Commit Graph

22764 Commits

Author SHA1 Message Date
Stephan
c6891c6c70 RegisterUnique 2018-11-29 10:35:16 +01:00
Stephan
e9de6c1fc9 Naming is hard 2018-11-28 17:35:12 +01:00
Stephan
e42f140a2c Cleanup 2018-11-28 16:57:01 +01:00
Stephan
b1651b8c9e Delete legacy code 2018-11-28 16:22:20 +01:00
Stephan
8d49fb3e8b Cleanup and document controller constructors 2018-11-28 16:19:50 +01:00
Stephan
f9a19ada04 IContainer.die.die.die 2018-11-28 12:59:40 +01:00
Stephan
49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Stephan
f290065bb6 More container tests 2018-11-27 16:27:16 +01:00
Stephan
80f3fc6864 Get rid of IContainer.GetRegistered 2018-11-27 15:20:26 +01:00
Stephan
de8dbe0041 Cleanup 2018-11-27 15:17:26 +01:00
Stephan
b365539368 Optimize 2018-11-27 15:15:44 +01:00
Stephan
5d167b49a4 More composition fixes 2018-11-27 15:09:08 +01:00
Stephan
c23c7749b4 Composition fixes 2018-11-27 14:04:08 +01:00
Stephan
5b111f9629 More composition simplification 2018-11-27 10:37:33 +01:00
Stephan
b8608f1b2e Refactor runtimes, injection and composition 2018-11-26 16:54:32 +01:00
Stephan
8b74453c13 Simplify IContainer.CreateInstance 2018-11-24 16:41:27 +01:00
Stephan
392c9ed83b More filesystem DI fixes 2018-11-24 15:38:00 +01:00
Stephan
ce47eae85b Various fixes 2018-11-23 16:19:03 +01:00
Stephan
6ffc340725 Merge branch temp8 into temp8-di2690 2018-11-23 14:58:08 +01:00
Bjarke Berg
31b4e944e7 Fixed issue where tree root was not shown when moving items. Pair programming with @mads 2018-11-23 13:57:26 +01:00
Shannon
77f855a649 Removes a ton of duplicate code 2018-11-22 17:46:49 +11:00
Shannon
08dc94a535 Merge branch 'temp8' into temp-tinymce
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
2018-11-22 15:38:58 +11:00
Shannon
57074d3545 some code cleanup 2018-11-22 15:26:10 +11:00
Shannon
3947a471be Fixes tree sync with sorting media 2018-11-21 16:59:23 +11:00
Shannon
fda327a604 removes $routeParams from a dependency on content.resource, fixes event ordering during nav init, fixes tree re-syncing after sorting, removes some obsolete/old code 2018-11-21 16:40:13 +11:00
Stephan
64dd7c113c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 15:19:07 +01:00
Stephan
e056f1b282 Fix tests 2018-11-20 15:17:01 +01:00
Mads Rasmussen
219b38ff77 fix authorize upgrade screen 2018-11-20 12:33:26 +01:00
Shannon
63470c80dd fixes build 2018-11-20 20:28:17 +11:00
Shannon
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
Shannon
d2a61e5b9c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 19:31:08 +11:00
Shannon
82e7be4ae9 Fixes creating content type collections 2018-11-20 18:43:41 +11:00
Stephan
8aaa75778e Cleanup 2018-11-20 08:35:28 +01:00
Stephan
5f8e46e3cd Merge branch 'temp8' into temp8-3713 2018-11-20 08:15:26 +01:00
Shannon
fad566afba Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
2018-11-20 18:14:36 +11:00
Shannon
3dfa3eaac7 fixes media picker svg handling to only use a single IMG tag, else this resulted in a number of 404's with invalid paths like [Object,object] 2018-11-20 18:13:19 +11:00
Shannon
e6718c6989 more manual merging 2018-11-20 17:44:24 +11:00
Shannon
bc66d4cbc6 manually merges list view changes with new blueprint functionality, manually merges other files, fixes issue with Action drop down in v8 2018-11-20 17:00:37 +11:00
Shannon
d5a8e7751b Removes the word "Kim" from the list view 2018-11-20 15:25:02 +11:00
Shannon
96d7cca68d Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
2018-11-20 14:12:26 +11:00
Shannon
b4c2c8bd74 manually merging 2018-11-20 14:11:35 +11:00
Shannon
9ae4d1cdf5 fixes how the grid rte resizes when a tab changes to use the proper event handler 2018-11-20 14:10:20 +11:00
Shannon
80070e7332 Fixes how the new move method on MediaService deals with event messages 2018-11-20 12:20:16 +11:00
Shannon
f7f81945a0 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 11:51:59 +11:00
Shannon Deminick
c981f5e1b0 Merge pull request #3711 from aaronpowell/temp8-3710
Fixes 3710: Removing the usage of HostingEnvironment.MapPath
2018-11-20 11:31:26 +11:00
Stephan
e41790b886 Add IContainer tests 2018-11-19 15:16:55 +01:00
Stephan
b69cbf0c53 Remove RegisterOrdered requirement from IContainer 2018-11-19 15:10:35 +01:00
Stephan
199e09c789 Remove named services support requirement from IContainer 2018-11-19 14:52:55 +01:00
Stephan
87a64b7406 Refactor filesystems (again) 2018-11-19 14:40:59 +01:00
Aaron Powell
8a809fe97a Pushing crash handling on app domain into CoreRuntime 2018-11-19 22:02:51 +11:00