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

18228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sebastiaan Janssen
13aa615745 U4-9004 Remove URLRewriting.net dependency 2017-03-09 11:41:36 +01:00
Stephan
b8c0d4c4ea U4-9595 - improve log error msg on thread aborts on timeouts 2017-03-09 11:35:06 +01:00
Stephan
6992b0319a Version 7.6-alpha074 2017-03-08 18:59:27 +01:00
Stephan
d1111009e3 Fix SemVer lib version 2017-03-08 18:45:00 +01:00
Sebastiaan Janssen
6c624ca08a Merge pull request #1785 from CreunaAB/fix/add-missing-sv-translation 
Adds missing swedish translation for document type without template
 2017-03-08 15:21:55 +01:00
Shannon Deminick
1722831bf5 Merge pull request #1640 from umbraco/temp-u4-7318 
Value Converters for All Core Property Editors
 2017-03-08 14:29:40 +01:00
Shannon
5291558b23 Further refactoring, using attributes, moving and removing some classes, using DI where necessary. 2017-03-08 14:27:39 +01:00
Warren Buckley
a3f6fb78f5 Bump version to alpha-73 after downgrade to .NET 4.5 2017-03-08 12:22:47 +00:00
Warren Buckley
736b3565d0 Merge pull request #1784 from umbraco/temp-deploy-257 
deploy-257 Downgrade Core and Deploy to framework 4.5
 2017-03-08 12:17:08 +00:00
Claus
ed782998ef Merge pull request #1779 from umbraco/temp-U4-9521 
U4-9521 MediaService.GetPagedChildren should only get children and not descendants
 2017-03-08 13:13:23 +01:00
Claus
31d980b0c5 Merge pull request #1782 from umbraco/temp-u4-9605 
U4-9605 - debug switch for uncompleted scopes
 2017-03-08 13:07:03 +01:00
Claus
9f6e4d4fd5 updating nuspec. 2017-03-08 12:04:48 +01:00
Claus
d90658d814 Merge pull request #1783 from umbraco/temp-u4-9588 
u4-9588 - filesystems
 2017-03-08 11:58:47 +01:00
Claus
7fa8f04b11 deploy-257 Downgrade Core and Deploy to framework 4.5 2017-03-08 11:20:48 +01:00
Stephan
bf2232258e U4-9588 - filesystems manager tlc 2017-03-08 11:02:30 +01:00
nengberg
8a133938e6 Adds missing swedish translation for document type without template 2017-03-08 09:57:32 +01:00
hartvig
c1b3f1977d Merge pull request #1768 from danieland/dev-v7 
U4-9571: Legacy icons look weird
 2017-03-07 18:58:13 +01:00
hartvig
f086156d48 Merge pull request #1781 from majken92/dev-v7 
Updating sv.xml with correct translation
 2017-03-07 18:53:43 +01:00
hartvig
7080013dd6 Merge pull request #1777 from jamescoxhead/U4-9373 
U4-9373 Fix for duplicate dashboards after upgrading
 2017-03-07 18:45:50 +01:00
Stephan
5bbb44479f U4-9588 - expand filesystems manager 2017-03-07 17:57:45 +01:00
Warren Buckley
5218d31f23 Bumps version to alpha-072 2017-03-07 15:43:29 +00:00
Stephan
9e55f5835c U4-9605 - debug switch for uncompleted scopes 2017-03-07 12:42:44 +01:00
Michael Razmgah
b080825bb2 Updating sv.xml with correct translation 2017-03-06 21:31:42 +01:00
Stephan
8bb696bf9a Merge pull request #1776 from umbraco/temp-U4-9587 
U4-9587 RebuildXmlStructures doesn't clear out stale data so there is…
 2017-03-06 14:51:50 +01:00