yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,255 Commits 4 Branches 7 Tags
6344ad28aae4a5decc8f8d263585cb3e64f98b49
Commit Graph

18255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus
6344ad28aa adding sqlsyntax. 2017-03-16 14:52:50 +01:00
Claus
eadc3c8c5a U4-9591 All PetaPoco Relators for 1:M mappings need to be reviewed to ensure there is a correct sort being used 2017-03-16 14:45:59 +01:00
Stephan
9b8db111dd Merge pull request #1790 from umbraco/temp-U4-9611 
U4-9611 Create Property Value Converters for all new UDI Property Edi…
 2017-03-16 14:36:17 +01:00
Stephan
7b506fadc6 U4-9611 - minor fix 2017-03-16 14:35:54 +01:00
Claus
1ce44565a3 Merge pull request #1764 from umbraco/temp-u4-9462 
U4-9462 units of work cleanup
 2017-03-16 13:12:32 +01:00
Stephan
e70e651901 U4-9462 - minor fix 2017-03-16 13:10:53 +01:00
Morten Christensen
d8c04b1f67 Merge pull request #1799 from umbraco/temp-U4-9632 
U4-9632 Ensure GUID generation on updated entity types in v7.6 is unique
 2017-03-16 10:09:31 +01:00
Shannon
172ef8c379 U4-7093 If allowManuallyChangingPassword=false on new install, installation doesn't work 2017-03-16 18:59:06 +11:00
Claus
7e1f045c09 U4-9632 Ensure GUID generation on updated entity types in v7.6 is unique 
removing unused using statements from other migrations.
 2017-03-16 08:19:03 +01:00
Sebastiaan Janssen
d2fdf7b647 Check if MediaPicker is configured as single or multiple and give back appropriate result for each (IPublishedContent vs IEnumerable<IPublishedContent>) 2017-03-15 23:22:53 +01:00
Sebastiaan Janssen
e1942d96d0 Incorporate Stephane's feedback: if we already know we're getting list of int or udi, we don't need to cast, or even test for the PropertyEditorAlias 2017-03-15 23:22:53 +01:00
Stephan
496e6c1711 U4-9462 - missed one safeXml.AcceptChanges 2017-03-15 14:50:42 +01:00
Stephan
3121ea6111 Merge branch 'dev-v7.6' into temp-u4-9462 2017-03-15 13:48:27 +01:00
Stephan
59ecc6e109 Merge branch 'dev-v7.6' into temp-U4-9611 2017-03-15 13:00:07 +01:00
Stephan
eb42b9a4b6 Merge pull request #1796 from umbraco/temp-U4-6566 
U4-6566 Membership provider `useLegacyEncoding` should default to `false`
 2017-03-15 12:37:09 +01:00
Stephan
82660cf6af Merge branch 'dev-v7.6' into temp-U4-9611 2017-03-15 12:10:27 +01:00
Stephan
54afd3d954 Fix failing test 2017-03-15 12:08:52 +01:00
Sebastiaan Janssen
241ccf00a5 U4-6566 Membership provider useLegacyEncoding should default to false 2017-03-14 17:05:24 +01:00
Sebastiaan Janssen
1a0046df95 Merge pull request #1795 from umbraco/temp-U4-9498 
U4-9498 LocalLinks as UDI
 2017-03-14 15:54:03 +01:00
Sebastiaan Janssen
3bddceb17b Put the rewrite section in system.webServer where it belongs 2017-03-14 11:00:41 +01:00
Sebastiaan Janssen
a2ca753dd9 Use RelatedLink class instead of weird extra inline class, convert UDI values 2017-03-14 10:26:13 +01:00
Sebastiaan Janssen
6f516a15aa Boyscout cleanup 2017-03-14 10:25:10 +01:00
Sebastiaan Janssen
223ed41c53 Use the extension method to get published content item - consistent with other PVCs 2017-03-14 10:24:31 +01:00
Sebastiaan Janssen
d2a3932626 Merge branch 'dev-v7.6' into temp-U4-9611 2017-03-14 10:22:39 +01:00
Sebastiaan Janssen
27fab61646 Merge pull request #1792 from umbraco/temp-U4-9497 
U4-9497 Update Related Links Property Editor to support UDIs
 2017-03-14 10:14:45 +01:00
Shannon
05f8870424 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-03-14 17:25:40 +11:00
Shannon
4a829154db Adds documentation link to IIS Rewrite rules 2017-03-14 17:10:39 +11:00
Shannon
f8073f429f adds debug transforms to ensure that any urlrewriting stuff is removed when the sln is built 2017-03-14 16:36:15 +11:00
Shannon
0a3220df85 Fixes null check, adds another test case 2017-03-14 16:26:17 +11:00
Shannon Deminick
04d37c590b Merge pull request #1786 from umbraco/temp-U4-9004 
U4-9004 Remove URLRewriting.net dependency
 2017-03-14 16:25:41 +11:00
Shannon
9a57f463ce Updates LocalLinks to be UDI, this will support both INT and UDI as LocalLink but when a new LocalLink is picked, it will use the UDI so eventually the INT will be gone 2017-03-14 15:31:30 +11:00
Sebastiaan Janssen
3904f9c503 Centralized getting an IPublishedContent item from a Udi in a single extension method so that we're not repeating that code all over the place all the time 2017-03-13 15:49:15 +01:00
Warren Buckley
7753993987 Adds in more checks for the UDI or int to be stored - as there is a similar call to open the dialog to pick content from another function name - unknown why 
Same for persisting data
 2017-03-13 13:48:13 +00:00
Shannon
8f48da8bb0 Gets the related links editor working with the old property value converter too, udpates the install script so that works and updates tests to reference the correct one, adds GUID overloads to the UrlProvider 2017-03-13 16:58:41 +11:00
Shannon
aba325e109 Creates UDI Related Links Property Editor and deprecates the old one 2017-03-13 16:14:30 +11:00
Shannon
2dd31f0f05 reverts the change for the showing an error if the node doesn't exist - it was for a start node (i.e. based on a user), not for an existing picked node 2017-03-13 16:00:56 +11:00
Shannon
d42d96e166 Fixes issue with new picker logic when a picked node no longer exist, this would result in a 404 error which would actually show the red error and the dialog would die, instead we handle the error and initialize the tree when were ready 2017-03-13 15:04:35 +11:00
Shannon
3571c238b4 Renames the new UDI pickers to still be suffixed with "PropertyEditor" to make things more consistent 2017-03-13 12:59:36 +11:00
Shannon
2087332b69 removes committed Deploy dashboard config 2017-03-13 12:58:44 +11:00
Shannon
dc71f9cd5e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-03-13 12:39:27 +11:00
Shannon
99ed4d6cb9 Makes umbraco.GlobalSettings.UmbracoMvcArea available since we haven't been able to get the GlobalSettings into the right public classes yet. 2017-03-13 12:38:08 +11:00
Shannon Deminick
3646cfb47e Merge pull request #1791 from soreng/patch-3 
Removed weird comment
 2017-03-12 21:37:44 +01:00
Søren Gregersen
1b7ce8bcde Removed weird comment 
removed "this" as remark for NewPassword
 2017-03-12 21:20:24 +01:00
Sebastiaan Janssen
89c84676dd U4-9611 Create Property Value Converters for all new UDI Property Editors 2017-03-11 16:44:57 +01:00
Shannon
1c7b374c42 Fixes new property value converters to shadow their old ones correctly 2017-03-10 12:27:29 +01:00
Shannon
7100a00ef1 fix merges 2017-03-10 12:22:44 +01:00
Shannon
df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-03-10 10:40:28 +01:00
Stephan
b893df035b Files were committed by mistake 2017-03-10 08:48:26 +01:00
Sebastiaan Janssen
67c6146f96 Merge pull request #1787 from umbraco/temp-u4-9595 
U4-9595 - improve log error msg on thread aborts on timeouts
 2017-03-09 15:59:47 +01:00
Stephan
6439e2fdd0 Merge dev-v7.6 into temp-u4-9462 2017-03-09 15:29:26 +01:00