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

15970 Commits

Author SHA1 Message Date
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
Sebastiaan Janssen
72404e68a0 Merge pull request #1968 from umbraco/temp-u4-9927 
U4-9927 - fix migration
 2017-05-31 16:36:42 +02:00
Sebastiaan Janssen
2c451c5cfe Remove debug tracing 2017-05-31 16:29:26 +02:00
Stephan
af7f83f0f6 U4-9927 - fix migration 2017-05-31 15:49:15 +02:00
Shannon
5b3c2178a2 Revert "Merge pull request #1729 from marcemarc/marcemarc-U4-9480" 
This reverts commit 145f789631, reversing
changes made to 78bc38fe1b.
 2017-05-31 15:26:22 +02:00
Shannon Deminick
145f789631 Merge pull request #1729 from marcemarc/marcemarc-U4-9480 
U4-9489 - dictonaryToQueryString only returns first dictionary item
 2017-05-31 15:17:11 +02:00
Sebastiaan Janssen
e27e95cb1a U4-9952 Can not save XSLT files in 7.6 2017-05-31 11:11:56 +02:00
Sebastiaan Janssen
6feb7b222f U4-9971 Special "square bracket" notation in Umbraco.Field not working 2017-05-31 10:18:10 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Sebastiaan Janssen
728dee070f Merge pull request #1965 from umbraco/temp-U4-9894-2 
U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe t…
 2017-05-29 14:27:18 +02:00
Claus
4a735770e2 Merge pull request #1961 from umbraco/temp-U4-9937 
fixes: U4-9937 RTE Media Picker - Cannot add image to RTE after searching
 2017-05-29 11:42:05 +02:00
Shannon
d54b3a0cc3 U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe the EnablePropertyValueConverters setting 2017-05-29 09:38:16 +02:00
Claus
f962a3db20 Merge pull request #1953 from umbraco/temp-U4-9935 
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
 2017-05-29 09:34:29 +02:00
mikkelhm
39851d2475 Ignoring the StringEncodingTest2 as AppVeyors framework settings is doing weird things, that makes it fail 2017-05-26 13:31:29 +02:00
Mikkel Holck Madsen
28adbc17ef Merge pull request #1963 from umbraco/temp-deploy-324 
deploy-324 - fix udi encoding
 2017-05-26 13:14:29 +02:00
Shannon Deminick
4b9a13078e Merge pull request #1957 from umbraco/temp-U4-9940 
U4-9940 Make it easy to get the integer Id of an item from it's Udi
 2017-05-25 23:58:23 +10:00
Sebastiaan Janssen
17cce9a666 Make EntityService private 2017-05-25 15:40:26 +02:00
Sebastiaan Janssen
39da34e1c7 Attempt to force .NET 4.5 for tests 2017-05-25 13:14:56 +02:00
Sebastiaan Janssen
55dc927c8b Does this help get the StringEncodingTest2 to run? Doubt it. 2017-05-25 12:07:20 +02:00
Sebastiaan Janssen
6e3ff59dfb Adds GetIdForUdi to UmbracoHelper 2017-05-25 11:04:40 +02:00
Sebastiaan Janssen
08eab00627 Adds GetIdForUdi method to IEntityService 2017-05-25 10:48:28 +02:00
Sebastiaan Janssen
c4fae9b272 Remove extension method 2017-05-25 10:47:15 +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
Mads Rasmussen
dc5089a9d6 fix svg preview 2017-05-23 14:38:52 +02:00
Mads Rasmussen
45a246d8b6 handle entity and full media objects in media grid 2017-05-23 14:38:34 +02:00
Mads Rasmussen
65bcd78872 add helper to get file extension 2017-05-23 14:37:51 +02:00
Mads Rasmussen
a0fd7001e9 fixes image select in details overlay 2017-05-23 14:37:26 +02: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
8eb0d254da U4-9940 Make it easy to get the integer Id of an item from it's Udi 2017-05-21 13:35: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