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

15941 Commits

Author SHA1 Message Date
Sebastiaan Janssen
55dc927c8b Does this help get the StringEncodingTest2 to run? Doubt it. 2017-05-25 12:07:20 +02:00
Stephan
51186bea24 deploy-324 - fix udi encoding 2017-05-24 11:20:01 +02:00
Bjarne Fyrstenborg
5a4e6df99c Merge remote-tracking branch 'upstream/dev-v7' into dev-v7-U4-9571 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/tree.less
 2017-05-24 09:40:14 +02:00
Bjarne Fyrstenborg
22f8a4c5dd Fix overwriting background repeat and position on legacy tree icons 2017-05-24 09:24:26 +02:00
Shannon Deminick
aaf7ae0331 Merge pull request #1960 from umbraco/temp-u4-9936 
U4-9936 - fix xml cache refresh in lb
 2017-05-24 16:15:03 +10:00
Shannon Deminick
8459a058c6 Merge pull request #1956 from umbraco/temp-U4-9898 
U4-9898 Reset password should unlock a locked account
 2017-05-24 15:36:33 +10:00
Stephan
09ceb15d08 U4-9936 - fix xml cache refresh 2017-05-23 14:19:32 +02:00
Stephan
63d8ef7560 U4-9936 - fix xml cache refresh in lb 2017-05-23 11:21:18 +02:00
Shannon
27428bf545 U4-9907 Translations Section : Getting "open datareader" Issue : Relates to (U4-9201) 2017-05-23 16:23:40 +10:00
Sebastiaan Janssen
b9c418e458 Fix updating the actual lockout 2017-05-22 08:36:02 +02:00
Sebastiaan Janssen
c843e634ba Merge pull request #1954 from aburok/dev-v7.6-ScheduledPublishing_RequestLogging 
add log if request to ScheduledPublishController fails without exception
 2017-05-21 13:40:29 +02:00
Sebastiaan Janssen
70921e88f6 Okay, I give up.. disabling failing tests 2017-05-21 12:59:53 +02:00
Sebastiaan Janssen
d9b71995e1 Try to make sure TestingDefaults is set to false else IsFileAllowedForUpload_WithWhitelist fails 2017-05-21 12:42:54 +02:00
Sebastiaan Janssen
f517e750b9 Some more debugging to see if we are actually testing the correct config 2017-05-21 12:16:45 +02:00
Sebastiaan Janssen
07d91ce9ac Removes some code duplication by using parameterized test 
Add some debugging to unit test to figure out what's wrong with it
 2017-05-21 11:34:21 +02:00
dkoruba
ac8ee92bb8 fix typo 2017-05-20 20:55:40 +02:00
Sebastiaan Janssen
aee06c4574 U4-9898 Reset password should unlock a locked account 2017-05-20 14:33:33 +02:00
Sebastiaan Janssen
d0f69907db Ignore one test for now that only seems to fail on build server 2017-05-20 13:08:48 +02:00
Sebastiaan Janssen
71db33f4cd Merge pull request #1955 from umbraco/dev-v7.6 
Oops, wrong branch was targetted for U4-9908
 2017-05-20 12:30:56 +02:00
Sebastiaan Janssen
cf7c0dffb0 Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558 2017-05-20 11:48:47 +02:00
Sebastiaan Janssen
22d778ed28 Adds UDI redirect for FollowExternalRedirect 
Checks if the redirect property exists before trying to get it's value
Simplified conversions by asking for the property value by type
 2017-05-20 11:34:03 +02:00
Sebastiaan Janssen
a3a2b6499e Merge branch 'U4-9872' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-9872 2017-05-20 09:49:12 +02:00
dkoruba
65ed69cf06 add log if request to ScheduledPublishController fails without exception 2017-05-19 22:14:10 +02:00
Shannon Deminick
c09cd95eb6 Merge pull request #1951 from umbraco/temp-U4-9919 
U4-9919 Updated media files are deleted
 2017-05-19 13:17:35 +10:00
Shannon Deminick
1d3490eb82 Merge pull request #1950 from umbraco/temp-U4-9646 
U4-9646 RTE Link dialog should auto focus on url
 2017-05-19 12:05:05 +10:00
Shannon Deminick
c51d29da52 Merge pull request #1947 from umbraco/temp-U4-9896 
U4-9896 SqlCEconnection Type A originates from Version=4.0.0.0, Type B originates from 4.0.0.1
 2017-05-19 11:54:40 +10:00
Claus
79844154fb U4-9919 Updated media files are deleted 2017-05-18 11:30:11 +02:00
Claus
067a1ba8e6 U4-9646 RTE Link dialog should auto focus on url 2017-05-18 10:02:46 +02:00
Warren Buckley
120cb964a5 Merge pull request #1949 from umbraco/temp-u4-9926 
U4-9926 - fix partial view macro udis
 2017-05-17 13:39:48 +01:00
Stephan
147a1daf6d U4-9926 - fix partial view macro udis 2017-05-17 12:09:28 +02:00
Shannon
9badb35c05 fix merge issue 2017-05-17 20:08:53 +10:00
Shannon
765decf3b1 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs
 2017-05-17 20:00:29 +10:00
AndyButland
eb35791003 Reverted media picker behaviour when selecting images to use just configured image types 2017-05-16 21:16:11 +01:00
mikkelhm
69775c369a Bump version to 7.5.14 2017-05-16 08:33:19 +02:00
Stephan
02136d3060 U4-9908 - fix scope-related issues 2017-05-16 08:09:11 +02:00
Sebastiaan Janssen
99d4b13bb0 Adds SQLCE assembly redirect on fresh installs and upgrades 2017-05-15 22:54:46 +02:00
Claus
5dc3e0a3fc Merge pull request #1880 from marcemarc/temp-U4-9765 
debug logging when there is a distributed calls config issue
 2017-05-15 10:28:26 +02:00
Claus
d146df43e6 Merge pull request #1903 from HarveyWilliams/dev-v7 
U4-9806 Media Picker media hover should show full title
 2017-05-15 10:19:04 +02:00
James Coxhead
451826a329 Fixes umbracoInternalRedirectId property to work with UDI IDs 2017-05-14 21:52:45 +01:00
wanddy
c6bc5ae6aa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-05-10 22:37:47 +08:00
Shannon Deminick
f84d3b435b Merge pull request #1898 from DaveLong/U4-9799 
Fixed Serialization issue in ValidatePasswordResetCodeModel
 2017-05-10 14:59:04 +10:00
Shannon
d0b2f10a8c U4-9836 CreatorId on a media is overwritten on save 2017-05-10 14:32:09 +10:00
AndyButland
4a593a0814 Reverted to empty whitelist for default. 2017-05-09 23:59:43 +02:00
AndyButland
3cc0df0273 Fixed media picker calculation of intersection of allowed whitelist and images list 2017-05-09 23:44:31 +02:00
AndyButland
712cd29fea Upload checks to utilise whitelist. Refactored check on white and black list to common extension method. 2017-05-09 23:29:30 +02:00
AndyButland
3d21448f89 Validated file uploads using white list if provided, before falling back to blacklist 2017-05-09 18:12:51 +02:00
suedeapple
7b4912b1e7 automaticly - > automatically 2017-05-09 16:47:36 +01:00
suedeapple
8c6362d947 automaticly - > automatically 2017-05-09 16:40:59 +01:00
AndyButland
01dd28fc61 Retains original media creator when media is updated 2017-05-09 16:01:06 +02:00
mikkelhm
67e2c911f7 Re adds the umbraco.presentation.targets for Umbraco.Web.UI as it handles default transormations for confg files 2017-05-09 00:26:40 +02:00