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

23038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
7e383ea961 fix issue with infinite mode and create route param in media editor 2018-04-23 11:13:01 +02:00
Mads Rasmussen
312b2ff435 Merge branch 'dev-v8' into temp-U4-11218 2018-04-23 09:43:22 +02:00
Shannon
6b12fe7c57 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
 2018-04-20 00:10:44 +10:00
Shannon
04da7cfd20 doh, fixes csproj merge 2018-04-20 00:09:12 +10:00
Shannon
d5ebe12983 removes ununsed aliases 2018-04-20 00:05:45 +10:00
Stephan
5d1abaa713 Import missing parameter editor from v7 merge 2018-04-19 16:03:54 +02:00
Shannon
e9e0274ad8 fixes MultipleContentPickerParameterEditor 2018-04-20 00:03:19 +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
Mads Rasmussen
ee853f0189 Merge branch 'dev-v8' into temp-U4-11218 2018-04-19 15:15:10 +02:00
Shannon
1d0d6e78de fixes tree again 2018-04-19 22:32:48 +10:00
Shannon
642ce36f59 updates when the tree does it's initialization , fixes migration 2018-04-19 21:58:59 +10:00
Shannon Deminick
db5ffd6b29 Merge pull request #2594 from umbraco/temp8-U4-11128 
Manage content variations [U4-11128]
 2018-04-19 21:49:13 +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
Shannon
158eb18de0 Merge remote-tracking branch 'origin/dev-v8' into temp8-U4-11128 2018-04-19 18:16:49 +10:00
Mads Rasmussen
03ac073c02 Merge branch 'dev-v8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
 2018-04-19 09:59:31 +02:00
Sebastiaan Janssen
96761efe4d Merge branch 'patch-v7' into dev-v7 2018-04-19 09:55:16 +02:00
Robert
8e02aad2bb Merge pull request #2590 from umbraco/temp-U4-11177 
U4-11177 Update tree nodes with the new node names based on variant/language
 2018-04-19 08:35:01 +02:00
Shannon
75fb070825 U4-11246 When user belongs to groups and none of them have browse access and one or more have a custom start node applied a YSOD occurs 2018-04-19 16:20:18 +10:00
Shannon Deminick
8a0f32e980 Merge pull request #2595 from umbraco/temp-U4-11208 
U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method
 2018-04-19 15:27:00 +10:00
Stephan
a68e37c67b Fix availability and names 2018-04-18 18:43:17 +02:00
Stephan
dea47dfafe Fix availability and names 2018-04-18 18:28:47 +02:00
Sebastiaan Janssen
f5163ed0c2 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-18 16:05:43 +02:00
Sebastiaan Janssen
694f3d71e2 Merge branch 'patch-v7' into dev-v7 2018-04-18 16:05:15 +02:00
Stephan
5b1bdd84ee Fix availability and content name (WIP) 2018-04-18 16:04:33 +02:00
Robert
15eb40aedb Removed code that populates content tree with duplicate start nodes. 2018-04-18 16:01:01 +02:00
Sebastiaan Janssen
49251271e9 Merge pull request #2591 from umbraco/temp-U4-10995 
Removed code that populates content tree with duplicate start nodes.
 2018-04-18 15:59:45 +02:00
Sebastiaan Janssen
cc3e75dc63 U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method 2018-04-18 15:14:16 +02:00
Stephan
4f17ecbdee Fix tests 2018-04-18 14:43:13 +02:00
Stephan
ec7b038569 Variant names, availability, etc 2018-04-18 14:43:07 +02:00
Stephan
d4244d3807 Fix faster languages 2018-04-18 14:42:20 +02:00
Sebastiaan Janssen
eeaf17c857 Weird revert of a PR that was merged in before 
(cherry picked from commit 94ed741dd5)
 2018-04-18 12:18:44 +02:00
Stephan
46487fa466 Variant names, availability, etc 2018-04-18 11:14:08 +02:00
Dave Woestenborghs
21a8395142 U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor

(cherry picked from commit f25233ac2b)
 2018-04-18 10:22:09 +02:00
Dave Woestenborghs
f25233ac2b U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) 
U4-11216 set min and max number when used as parameter editor
 2018-04-18 10:21:12 +02:00
Shannon Deminick
415810ecfe Merge pull request #2589 from umbraco/temp-U4-11196 
Fixes - U4-11196 Validation UI is not working for the content name field
 2018-04-18 11:16:38 +10:00
Shannon
fd3129f166 fixes TODOs 2018-04-18 09:42:30 +10:00
Stephan
58e4e2398a Variant names, availability, etc 2018-04-17 19:08:53 +02:00
Stephan
392965bb3a Faster languages 2018-04-17 19:08:44 +02:00
Sebastiaan Janssen
61cd59b237 Merge branch 'patch-v7' into dev-v7 2018-04-17 15:47:41 +02:00
Sebastiaan Janssen
7d171b1e95 Bumps version to 7.10.4 2018-04-17 15:46:39 +02:00
Sebastiaan Janssen
d63061fade Merge pull request #2564 from leekelleher/U4-11184 
U4-11184 - Nested Content PropertyValueEditor - return converted value, not update reference value
 2018-04-17 15:33:14 +02:00
Sebastiaan Janssen
362261e879 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-17 15:16:46 +02:00
Sebastiaan Janssen
af8c00d075 Merge remote-tracking branch 'origin/patch-7.10.3' into dev-v7 2018-04-17 15:16:21 +02:00
Sebastiaan Janssen
68b440e494 Merge remote-tracking branch 'origin/patch-7.9.5' into dev-v7 2018-04-17 15:15:44 +02:00
Sebastiaan Janssen
0c328ef30e Merge remote-tracking branch 'origin/patch-7.8.2' into dev-v7 2018-04-17 15:15:06 +02:00
Robert
ef47e85741 Removed code that populates content tree with duplicate start nodes. 2018-04-17 15:07:59 +02:00
Stephan
26af63549f Fix vsts - wip 2018-04-17 10:52:32 +02:00
Stephan
70e3f895da Fix vsts - wip 2018-04-17 10:11:14 +02:00
Mads Rasmussen
e6a69ccb0d add feature toggle for media grid edit button 2018-04-17 09:55:31 +02:00