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

2660 Commits

Author SHA1 Message Date
Claus
fa68bee762 removing left over using statements and references to SharpZipLib. 2017-10-24 15:16:12 +02:00
Stephan
8a114a105e U4-8409 - reduce sharpZipLib dependencies 2017-10-16 19:03:05 +02:00
Shannon
4175c0530f Merge branch 'dev-v7' into temp-U4-10503-2 2017-10-09 23:05:17 +11:00
Shannon
cf97926f26 trying another test fix 2017-10-09 19:00:00 +11:00
Shannon
4b08c3a5c3 Reset PluginManager on each tests, no reason not to, this should resolve the issue 2017-10-09 18:20:07 +11:00
Shannon
fbda4fc8d1 Fixes part of the failing tests 2017-10-09 17:49:01 +11:00
erikarenhill
b363a1711a U4-10478: Bugfix where it would throw an IndexOutOfBounds when passing a word shorter than … to Truncate. Now checks whether the input wanted an elipsis and also if it reached the end. 2017-09-28 15:52:13 +02:00
Shannon
22ff362521 Changes email validation in c# to use the email address attribute like we do elsewhere in the codebase, adds unit test assertions to verify it validates the new odd email addresses 2017-09-27 22:50:47 +10:00
Sebastiaan Janssen
7e25501ac5 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-27 10:08:44 +02:00
Stephan
349d89e4d7 deploy-401 - fix id reservations 2017-09-22 13:08:05 +02:00
Sebastiaan Janssen
6cd2a15964 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/UdiEntityType.cs
 2017-09-13 17:34:35 +02:00
Sebastiaan Janssen
dd440eb9d5 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:09:17 +02:00
Stephan
ef91e152b4 U4-10409 - udi parsing and assembly scanning 2017-09-13 12:00:56 +02:00
Stephan
add0685d3f U4-10409 - udi parsing 2017-09-13 09:35:17 +02:00
Shannon
27fc3a9bb3 U4-10409 UDI Parsing should not require scanning assemblies 2017-09-13 14:16:43 +10:00
Stephan
e8faf54edf Merge pull request #2187 from umbraco/temp-U4-10118 
temp u4 10118
 2017-09-12 16:05:55 +02:00
Stephan
8548ee7761 u4-10118 - don't create a FS provider manager just to reset it 2017-09-12 16:05:35 +02:00
Claus
0700e37830 adding unit tests for urls. 
adding unit test for creating child content without identity.
cleaning up some usings ...
 2017-09-12 14:44:01 +02:00
Shannon
59afcd8be7 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 13:38:34 +10:00
Shannon Deminick
41eeb38c5f Merge pull request #2043 from umbraco/TEMP-u4-10135 
Added TruncateByWords method + overloads
 2017-09-12 13:36:00 +10:00
Sebastiaan Janssen
3275f03aff Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-11 15:46:54 +02:00
Sebastiaan Janssen
3423d8b2cc Merge branch 'dev-v7' into temp-u4-10006 
# Conflicts:
#	.gitignore
#	build/Build.bat
#	build/Build.proj
#	build/BuildBelle.bat
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-09 14:54:48 +02:00
Sebastiaan Janssen
c66a763406 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-08 18:58:48 +02:00
Claus
6e348a3a1a Merge branch 'HarveyWilliams-patch-4' into dev-v7 2017-09-08 13:59:35 +02:00
Claus
733c920867 using string.replace instead of regex. 
adding unit test.
 2017-09-08 13:57:28 +02:00
Shannon
ab3407a1aa Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-09-08 11:31:04 +10:00
Robert
18d0fec014 Added some trimming and test to StripHtmlTags 2017-09-06 12:03:15 +02:00
Robert
851d587d1f Added Html Strip tests 2017-09-06 11:28:44 +02:00
Robert
6a3f94d0e1 Forgot to clean test names 2017-09-06 11:19:30 +02:00
Robert
b1358936b4 Cleaning up tests and useless TruncateByWords functions 2017-09-06 11:17:06 +02:00
Shannon
66affa7f85 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-05 19:22:37 +10:00
Stephan
84fd5dc2ee perfs - IContentService.IsPublishable 2017-09-04 19:49:28 +02:00
Shannon
7926a0c676 Simplifies the change password logic with the back office so an admin user can easily change another user's password if they have access to the users section. Updates the controllers to populate the modelstate correctly, changes name of HasAppAccess to HasSectionAccess. Ensure we don't have duplicate ysod dialogs when there is an error. 2017-09-04 22:03:03 +10:00
Stephan
9a06c3a5ff Implement ILocalizationService.GetDictionaryItemKeyMap 2017-09-04 11:31:20 +02:00
Shannon
a608577a4f Merge branch 'dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-04 16:51:20 +10:00
Shannon
342ce7e507 updates user authz logic and adds more tests (and fixes test) 2017-08-31 15:53:15 +10:00
Shannon
e18c91dedc fixing tests 2017-08-30 12:10:02 +10:00
Shannon
209273ba64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/init.js
#	src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
 2017-08-30 11:08:36 +10:00
Shannon
78e66ce25f ok, hope this fixes tests 2017-08-29 16:34:30 +10:00
Shannon
dcc0374464 trying to fix unit tests 2017-08-29 15:18:16 +10:00
Shannon
7571dab4cc Updates the user auth helper and adds unit tests for it's scenarios 2017-08-29 15:13:07 +10:00
Shannon
a95afa610f updates unit test config to work with new unit tests 2017-08-29 12:01:32 +10:00
Shannon
13e2112c3c U4-10361 Creating new member when AllowManuallyChangingPassword="false" - can't set a password 2017-08-29 11:56:38 +10:00
Shannon
d71b8a139f Moves GetCookieValue to an extension method, cleans up code, adds unit tests 2017-08-29 10:50:20 +10:00
Stephan
cf450bebc3 Bugfix CombineStartNodes 2017-08-28 15:26:27 +02:00
Shannon
241fbb2144 combine start node tests 2017-08-28 23:06:31 +10:00
Shannon
513aa0b95d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-28 22:41:14 +10:00
Sebastiaan Janssen
7a0c6ab975 Merge pull request #2135 from umbraco/temp-U4-10301 
U4-10301 Change the PluginManager hash to use more reliable and consi…
 2017-08-28 11:44:40 +02:00
Robert
84f684ed31 Truncate with trimming should now work, added some mpore tests for truncate by words methods 
Fix: Original Truncate method show now be able to trim
Add: Added some more tests for Truncate by words to cater for tagsAsContent parameter
Fix: In original truncate, currentTextLength prop will be increased everytime a tag is added, this will fix an issue when tagsAsContent is set to true (it would have added an extra char per tag, which would have went over to the next word)
 2017-08-25 11:39:13 +02:00
Sebastiaan Janssen
49bf7e43a4 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-24 20:58:56 +02:00