yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,031 Commits 4 Branches 7 Tags
11ffafacdf42a461b793df8a3e32fda1c88b6a4f
Commit Graph

367 Commits

Author SHA1 Message Date
Bjarke Berg
11ffafacdf Revert "Revert "Identify element types"" 
This reverts commit ff6a9ba9
 2019-01-15 15:12:59 +01:00
Stephan
19233c2e5f Merge branch temp8 into temp8-examine-updates-3920 2019-01-11 08:24:36 +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
95ef6cd249 Merge branch 'temp8' into temp8-examine-updates-3920 2019-01-10 15:44:16 +01:00
Stephan
19ae9f5dee Refactor configuration for DI 2019-01-07 19:40:07 +01:00
Shannon
f7c70bde1e Fixing up the PublishedContentQuery.Search implementation 3920 2019-01-07 23:49:29 +11:00
Stephan
edfc3996d6 Adjustments for Forms and Deploy 2019-01-04 16:42:55 +01:00
Stephan
a60fd1b7be Merge branch origin/temp8 into temp8-di2690 2018-12-21 15:47:08 +01:00
Stephan
5286e02f11 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-20 10:19:02 +01:00
Steve Temple
fcbfb1a56e Rename PluginManager to TypeLoader in tests 2018-12-19 16:44:35 +01:00
Stephan
fd6a5f60d2 Merge branch 'temp8' into temp8-contentquery-search-culture-3828 2018-12-19 16:06:35 +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
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
Stephan
adced099be Move UmbracoConfig singleton to Current 2018-12-12 23:31:16 +01:00
Shannon
971e92d659 fixes last PublishedMediaTests 2018-12-10 14:11:41 +11:00
Shannon
db1a535af4 Fixes published media tests with Examine and un-ignores them... more tests are better than less even if we aren't using Examine for real media cache 2018-12-10 14:06:25 +11:00
Stephan
7f8eeeab83 Merge branch temp8 into temp8-di2690 2018-12-07 16:12:08 +01:00
Stephan
02617885b4 Disable media tests that use Examine (no point) 2018-12-07 15:57:19 +01:00
Stephan
ed222510f0 Fixes 2018-12-07 13:24:25 +01:00
Stephan
ccd0437b2e Disable media tests that use Examine (no point) 2018-12-07 12:06:25 +01:00
Stephan
710ec704b3 Merge branch temp8 into temp8-di2690 2018-12-07 09:52:46 +01:00
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
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
Shannon
6ab5d6ec9f More cleanup, removes options since it was irrelevant 2018-11-28 18:39:03 +11:00
Shannon
3fd0aef18e decouples data lookup from indexers and rebuilding logic 2018-11-28 01:23:02 +11:00
Stephan
b8608f1b2e Refactor runtimes, injection and composition 2018-11-26 16:54:32 +01:00
Shannon
9368c71ced fixes tests 2018-11-26 14:43:08 +11:00
Stefano Chiodino
cc8cb96140 The change to nullable expands to even more neighbors... 2018-11-15 07:23:09 +00:00
Stephan
0d5bf5e9c6 Merge branch 'temp8' into temp8-di2690 2018-10-09 23:03:03 +02:00
Stephan
ee24fb4ef7 Make Tests Green Again 2018-10-09 23:02:22 +02:00
Stephan
a9e0f90ef0 Fix merge 2018-10-08 19:27:32 +02:00
Stephan
66d931490e Merge branch temp8 into temp8-di2690 2018-10-08 19:22:20 +02:00
Stephan
e44ed00c97 Another fallback iteration 2018-10-03 10:31:35 +02:00
Stephan
8a29745b98 Merge branch temp8 into temp8-11502 2018-10-01 14:45:33 +02:00
Ed Parry
4184288afc Removed test aimed at testing the httpcontext works (after removal of storing page ID there) 2018-09-23 14:07:04 +01:00
Ed Parry
22f25ee467 Replaced references of PageID with the UmbracoContext calls. 2018-09-23 13:39:51 +01:00
Stephan
0928fc099d Merge branch temp8 into temp8-11502 2018-07-31 15:34:42 +02:00
Stephan
2c66cdc102 Merge branch temp8 into temp8-di2690 2018-07-31 14:50:01 +02:00
Shannon
a83ea47c25 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
#	src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.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/prevalueeditors/multivalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.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.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/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	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/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/umbraco.MacroEngines/Resources/Web.config
#	src/umbraco.cms/Actions/ActionRestore.cs
#	src/umbraco.editorControls/yesno/YesNoDataType.cs
 2018-07-30 21:31:35 +10:00
AndyButland
49c6212cb6 Implemented constants, tests and functionality for trying one fallback method and then another 2018-07-28 08:11:48 +02:00
Stephan
a35f67ecef Refactoring 2018-07-24 15:04:30 +02:00
Stephan
053698baf6 Merge branch andyb/u4-11502 into temp8-11502 2018-07-23 15:12:52 +02:00
Stephan
d2376bf4e3 Cleanup registrations 2018-07-23 08:56:08 +02:00
AndyButland
1be74589f2 Combined fallback parameters into an array that defines methods and priority to be used. 2018-07-21 15:58:49 +02:00
AndyButland
695f21eadb Removed unnecessary loop in looking up value from a fall-back language. 
Put in a check to abort fall-back if there's a loop in language fall-backs.
 2018-07-21 09:41:07 +02:00
Stephan
981152b693 Move IContainer extension methods 2018-07-20 16:39:39 +02:00
Stephan
5836cd05cb Abstract container (in progress) 2018-07-20 15:45:01 +02:00