yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,116 Commits 4 Branches 7 Tags
85bdc8f14d4f092c96a25de140ff1b0d9aa3c913
Commit Graph

1165 Commits

Author SHA1 Message Date
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
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
b1ef9c5aa8 U4-11502 misc fixes 2018-07-18 12:27:14 +02:00
Stephan
b5dc538905 Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502 2018-07-18 11:13:22 +02:00
Shannon
959caf4d04 Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does 2018-07-18 15:42:12 +10:00
Shannon
ec1d013004 Manually merges the IgnorePublishedContentCollisions change, removes more service locator pattern, removes ContextMapper with UmbracoContext and instead uses IUmbracoContextAccessor and adjusts some DI. 2018-07-18 14:34:32 +10:00
AndyButland
91a0ee2c93 Refactored to object graph reference of fallback language to just use id 2018-07-12 20:52:02 +01:00
Stephan
2051caaa01 Post-merge fixes 2018-07-12 18:05:48 +02:00
AndyButland
50c5b2ed92 Added test for fallback languages 2018-07-11 22:15:58 +01:00
Shannon
92f85fad4a Merging dictionary changes 2018-07-11 16:59:05 +10:00
Shannon
ebe224fb6e Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-07-11 16:43:21 +10:00
Shannon
7aa413d558 Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing) 
# Conflicts:
#	build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Constants-Applications.cs
#	src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
#	src/Umbraco.Core/Services/ConsentService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/RelationService.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ConsentServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
#	src/Umbraco.Web.UI.Client/src/less/application/grid.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/main.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	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/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MacroController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
 2018-07-11 15:58:48 +10:00
Stephan
ad633c7606 Merge branch 'temp8-2758' into temp8 2018-07-10 09:36:28 +02:00
AndyButland
11871dc4f7 Changed the services reference in the published value fall back via language implementation to constructor injection 2018-07-08 16:14:58 +02:00
AndyButland
aadd843c33 Implemented published value fall back via language 2018-07-08 16:14:58 +02:00
AndyButland
592de8bebc Model, retrieval, mapping and display for fall back language editing 2018-07-08 16:14:47 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
ecf9a928d7 Refactor variations 2018-07-03 13:05:21 +02:00
Stephan
9c3e8b8e3c Fix language inconsistencies management 2018-07-03 13:04:27 +02:00
Anthony
40f04f7510 Fixed unintended whitespace 2018-07-02 10:47:43 +01:00
Anthony
7affbbd186 Removed obsolete methods from Umbraco.Web which are not used. 2018-07-01 18:06:00 +01:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
lkoruba
b515f24c16 Change calls to logger.Warn method to use Func<string> second part 2018-06-29 15:35:56 +02:00
Sebastiaan Janssen
8c815554da Merge pull request #2583 from dontbesorry80/U4-11198 
Allow capital letters for email address entry in RegisterModel
 2018-06-28 20:25:28 +02:00
Robert
385f1d6689 Merge pull request #2604 from umbraco/temp-U4-11276 
Implements doc type collections | connects #73
 2018-06-26 23:58:35 -07:00
Sebastiaan Janssen
d66e951b68 Updating code style, removes obsolete files, now we can move the tree to the Translation section 2018-06-13 20:20:21 +02:00
Dave Woestenborghs
9c33f1b1c9 U4-5683 Migrate Dictionary tree & editor to angular (#2159) 2018-06-13 20:19:18 +02:00
Robert
0e72c34973 Merge pull request #2664 from umbraco/temp8-U4-11401 
U4-11401 Unique content naming isn't implemented for culture variants
 2018-06-04 15:16:57 +02:00
Stephan
01927e1e53 Fix variation context accessor 2018-06-04 11:44:54 +02:00
Shannon
504b6cb079 Changes Content.Names to Content.CultureNames and Content.PublishNames to Content.PublishCultureNames 2018-06-01 16:15:46 +10:00
Shannon
1cd4862803 Fixes user Id is 0 everywhere 2018-05-31 16:52:38 +10:00
Shannon
f2b78c06ef FIxes issue where an invariant property type was being validated with a culture when that would always fail. Fixes issue when saving a content type to ensure that a property type is never both variant and invariant. Adds test. 2018-05-10 18:01:41 +10:00
Shannon
8642a52a12 Fixes property model binding to display to show the invariant data if the property is non variant 2018-05-09 14:35:23 +10:00
Stephan
6d1f42c9b6 Fixes 2018-05-08 16:41:37 +02:00
Stephan
b1faade9b0 Revert various changes 2018-05-08 16:41:30 +02:00
Shannon
ee9f150483 Removes the AdditionalData properties for EntitySlim and moves them to real properties of IDocumentEntitySlim, renames PublishedCultureInfos to not be plural 2018-05-08 12:43:07 +10:00
Shannon
85c739aed4 Merge branch 'temp8-U4-11227' into temp8-U4-11282 
# Conflicts:
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
 2018-05-08 12:31:03 +10:00
Stephan
5247a9d143 Merge branch temp8 into temp8-U4-11227 2018-05-07 18:27:30 +02:00
Shannon
8a5ca2c4b4 Fixes being able to edit invariant content 2018-05-08 01:16:32 +10:00
Shannon
b1eeb5b193 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282 2018-05-08 00:39:12 +10:00
Shannon
97cb752cda Ensures the whole doc gets unpublished if a mandatory culture is unpublished, updates content service Unpublish to have it's own status result enum since that is needed. 2018-05-08 00:37:41 +10:00
Shannon
5a991c9424 Fixes Publishing/Unpublishing variants and it's nuances 2018-05-07 23:22:52 +10:00
Robert
c5de31cce3 Invariant property value should persist trough all variants of a content item 2018-05-04 13:44:04 +02:00
Stephan
aaa1ac0700 Merge branch temp8 into temp8-U4-11227 2018-05-02 17:50:58 +02:00
Stephan
a5f1ad6da1 Merge branch temp8 into temp8-U4-11227 2018-05-02 13:43:12 +02:00
Stephan
d56af5872d Implement basic fallback plumbing (in progress) 2018-05-02 13:38:45 +02:00
Robert
64d467e071 Merge pull request #2608 from umbraco/temp8-U4-11289 
U4-11289 Tracking the currently selected language in the main tree
 2018-05-02 12:10:02 +02:00
Shannon
be4ea93d12 U4-11289 Tracking the currently selected language in the main tree 2018-05-01 18:17:07 +10:00