yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,941 Commits 4 Branches 7 Tags
0330be4e6bb955e2be2a28e11e5327c32a2748ce
Commit Graph

422 Commits

Author SHA1 Message Date
Bjarke Berg
0330be4e6b Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
#	src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx.cs
 2019-01-11 08:29:29 +01:00
Stephan
ed7c8da81f Merge branch 'temp8' of https://github.com/StefanoChiodino/Umbraco-CMS into temp8-pr3583 2019-01-10 16:29:36 +01:00
Stephan
7db3644fcd Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 2019-01-10 14:04:52 +01:00
Stephan
19ae9f5dee Refactor configuration for DI 2019-01-07 19:40:07 +01:00
Stephan
84f6239c98 Components Initialize and Terminate 2019-01-07 09:46:11 +01:00
Shannon
118ad5361a Merge remote-tracking branch 'origin/temp8' into temp8-removes-config-based-indexes-3901 
# Conflicts:
#	src/Umbraco.Examine/UmbracoExamineIndex.cs
 2019-01-07 16:17:58 +11:00
Shannon
e20e570dc8 Fixes tests 2019-01-07 16:15:51 +11:00
Stephan
5670c6354e Introduce ComponentComposer to simplify registration of components 2019-01-05 15:49:10 +01:00
Stephan
1bd4cba9ac Fix component constructors 2019-01-04 08:36:38 +01:00
Stephan
816ed84a2f Refactor components 2019-01-03 21:00:28 +01:00
Bjarke Berg
eda46a16d0 Changed IContentType on IContent to a more simple class with lesser properties 2019-01-03 09:27:52 +01:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00
Stephan
bb9846a6ca Merge branch origin/temp8 into temp8-di2690 2018-12-21 10:58:38 +01:00
Stephan
fd6a5f60d2 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-19 16:06:35 +01:00
Stephan
7cdbe39ce5 Merge branch 'temp8' into temp8-backoffice-search-with-variants 2018-12-18 17:05:17 +01:00
Stephan
115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Stephan
8152862ad2 Fix issue with figuring out whether a published content version is draft 2018-12-18 08:31:10 +01:00
Stephan
35ebced4ed True standalone test 2018-12-17 18:55:36 +01:00
Shannon
4976782247 Updates search published content search extensions to correspond with new examine api changes, updates examine api changes 2018-12-17 12:17:03 +11:00
Shannon
d38e4e6e34 latest examine, fixes sortability 2018-12-14 11:32:20 +11:00
Stephan
adced099be Move UmbracoConfig singleton to Current 2018-12-12 23:31:16 +01:00
Stephan
e40c9cb227 Fix missing dependencies errors, simplify 2018-12-12 16:07:21 +01:00
Shannon
5148f34b32 Fixes ISearchableTree lifetime registration, fixes routing that clears required query strings, fixes lucene search string, gets URls in search results working with default lang/variants 2018-12-11 15:42:32 +11:00
Stephan
046f6f3cd9 Merge branch origin/temp8 into temp8-di2690 2018-12-10 17:49:11 +01:00
Shannon
bcd908e47d Changes term Indexer to Index and fixes a failing test 2018-12-10 13:06:39 +11:00
Stephan
710ec704b3 Merge branch temp8 into temp8-di2690 2018-12-07 09:52:46 +01:00
Stephan
fb4717d31e Merge branch 'temp8-3527-indexes-via-code' into temp8 2018-12-07 09:27:38 +01:00
Shannon
5c49069805 removes XmlCacheComponent since we will never use the xml cache in a website 2018-12-07 12:49:41 +11:00
Shannon
56d1a317c0 Gets searching working in the dashboard, updates to latest examine 2018-12-04 14:25:37 +11:00
Shannon
f8d203abff Updates latest examine + api updates + fixes tests, gets different validation working (valid, failed, filtered) 2018-12-03 22:10:56 +11:00
Shannon
340b8e6cef Latest examine, updates for dashboard, adds UmbracoExamineIndexDiagnostics 2018-11-29 13:55:51 +11:00
Stephan
49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Shannon
b6790261c4 Adds test 2018-11-26 17:20:15 +11:00
Stephan
6ffc340725 Merge branch temp8 into temp8-di2690 2018-11-23 14:58:08 +01:00
Aaron Powell
e1be4effca Fixes 3710: Removing the usage of HostingEnvironment.MapPath 2018-11-19 14:31:20 +11:00
Stefano Chiodino
cc8cb96140 The change to nullable expands to even more neighbors... 2018-11-15 07:23:09 +00:00
Stephan
a4c81b269f Merge branch temp8 into temp8-di2690 2018-10-26 15:10:20 +02:00
Stephan
8af1da3661 Merge branch temp8 into temp8-di2690 2018-10-25 10:59:49 +02:00
Stephan
a8110a0886 Merge branch temp8 into temp8-3129 2018-10-25 10:32:05 +02:00
Stephan
d71c879374 Merge branch temp8 into temp8-di2690 2018-10-23 18:01:52 +02:00
Stephan
4ec9350f54 Merge branch temp8 into temp8-3129 2018-10-23 17:44:31 +02:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Stephan
ba913db60e Fix to/from (in)variant changes 2018-10-22 17:20:48 +02:00
Shannon
c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	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/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00
Shannon
abeb4e04e5 Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests. 2018-10-19 15:41:28 +11:00
Stephan
66d931490e Merge branch temp8 into temp8-di2690 2018-10-08 19:22:20 +02:00
Shannon
9222ede853 Merge remote-tracking branch 'origin/temp8' into temp8-222-variant-invariant-data-updates 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
 2018-10-04 16:39:23 +02:00
Shannon
26759e97fa First iteration to populate property type changes when they are changed variant/invariant 2018-10-03 19:03:22 +02:00
Stephan
96acc1bd7e Contextualize variations in fallback, too 2018-10-03 16:19:41 +02:00