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

1125 Commits

Author SHA1 Message Date
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
Robert
fc860d5061 Merge branch 'temp8' into temp8-U4-11173 2018-05-01 08:27:45 +02:00
Stephan
dbf310caf1 Now use empty string for invariant in published 2018-04-30 21:03:43 +02:00
Shannon
19edfdb2a4 Removes unused and obsoleted code 2018-05-01 01:30:36 +10:00
Shannon
6faa2ff177 Removes unused and obsoleted code 2018-05-01 01:27:25 +10:00
Robert
a7f9628b48 Updated ContentItemDisplay model to contain IsEdited property 2018-04-30 16:06:53 +02:00
Stephan
038fc87a40 Cleanup, fix tests 2018-04-30 15:11:01 +02:00
Stephan
bcd0c95ec1 Refactor getting urls 2018-04-30 09:14:14 +02:00
Stephan
6959e595f5 IPublishedContent.UrlSegment 2018-04-30 09:14:14 +02:00
Stephan
ce8775b3e7 Cleanup IPublishedContent 2018-04-30 09:14:13 +02:00
Shannon
c19dbeda23 Adds a couple of tests which yielded some other issues with getting urls by culture, those are now fixed 2018-04-27 13:27:15 +10:00
Shannon
ffd85b4e94 Fixes more bugs and outbound routing for additional urls 2018-04-26 22:54:36 +10:00
Shannon
23c40cbf2c Fixes a couple issues, changes name from PublishValues to TryPublishValues 2018-04-26 21:37:29 +10:00
Shannon
e99c519032 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11220 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
 2018-04-26 19:18:14 +10:00
Stephan
16aac382d1 Merge branch 'temp8' into temp8-U4-11220 2018-04-25 17:38:36 +02:00
Stephan
aba5e849c1 Fix tests 2018-04-24 18:56:03 +02:00
Stephan
23333710f5 Implement culture available/edited 2018-04-24 16:50:13 +02:00
Shannon
d552d5dadb Updates UI and mapping to update a property type to allow being culture variant 2018-04-24 15:27:33 +10:00
Shannon
9044c9328d Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances 2018-04-24 13:07:18 +10:00
Shannon
48641166b9 WIP - gets 'inbound' routing working to generate culture specific URLs 2018-04-24 01:31:01 +10:00
Stephan
6dfb618efe Merge branch 'temp8' into HEAD 2018-04-23 12:57:12 +02:00
Stephan
a69019aea0 From int languageId to string culture 2018-04-21 09:57:28 +02:00
Shannon
c84087e96b Gets the variant names working in the editor 2018-04-20 00:59:23 +10:00
Shannon
966de9b9f4 Merge branch 'dev-v8' into temp8-U4-11219 2018-04-19 23:49:06 +10:00
Shannon
c46d4e9e43 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Scoping/NoScope.cs
#	src/Umbraco.Core/Scoping/ScopeProvider.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Tests/Persistence/Migrations/MigrationStartupHandlerTests.cs
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
 2018-04-19 23:41:35 +10:00
Shannon
8ae27ecc27 Updates doc type editor to be able to change update the doc type to support being culture variant 2018-04-19 22:06:02 +10:00
Robert
9384cd0f27 Merge pull request #2574 from umbraco/temp-U4-11195 
fixes U4-11195 Mapping complex properties slow down some queries
 2018-04-19 12:22:12 +02:00
Robert
0262b4aa76 Changed ContentPropertyDto modifier back to override which rendered content with tags unable to be saved 2018-04-19 12:10:39 +02:00
Stephan
5b1bdd84ee Fix availability and content name (WIP) 2018-04-18 16:04:33 +02:00
Stephan
4f17ecbdee Fix tests 2018-04-18 14:43:13 +02:00
Stephan
46487fa466 Variant names, availability, etc 2018-04-18 11:14:08 +02:00
Stephan
58e4e2398a Variant names, availability, etc 2018-04-17 19:08:53 +02:00
Claus
0c191a3ef7 updating to use includeProperties, fixing modifier keywords for methods, and passing includeProperties from list views. 2018-04-17 08:36:36 +02:00
Shannon
09b0d61ab8 Ensures current variant is at the top of the publish list and is selected, disable the publish button if there are none selected 2018-04-10 12:26:19 +10:00
Shannon
59f9af6eb8 Gets publish dialog mostly working with server side validation messages wired up to the dialog 2018-04-10 01:38:35 +10:00
Claus
5380b62504 fixes U4-11195 Mapping complex properties slow down some queries 2018-04-09 15:43:17 +02:00
Shannon
41d91c225f Gets validation working for trying to publish a document when there are validation problems with required languages 2018-04-09 16:59:45 +10:00
Shannon
e10698532b Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
 2018-04-06 13:56:07 +10:00
Shannon
c90d6be8ab U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI 2018-04-06 13:51:54 +10:00