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
|
b78c334589
|
Merge remote-tracking branch 'origin/master-v7' into dev-v7
|
2017-05-19 12:04:27 +10:00 |
|
Shannon Deminick
|
b41de9b623
|
Merge pull request #1944 from umbraco/temp-U4-9848
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
|
2017-05-19 12:02:11 +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 |
|
Shannon
|
54967e0150
|
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
|
2017-05-19 11:42:58 +10:00 |
|
Shannon
|
73e47402cb
|
Fixes docs build
|
2017-05-19 10:20:00 +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 |
|
Jason Prothero
|
65654de06a
|
Merge pull request #2 from protherj/fips-refactoring
Update Unit Tests to check for the correct version of Examine
|
2017-05-16 11:10:55 -07:00 |
|
Jason Prothero
|
2334596bf3
|
Update Unit Tests to check for the correct version of Examine
|
2017-05-16 11:06:00 -07:00 |
|
Jason Prothero
|
1d664bce52
|
Merge pull request #1 from protherj/fips-refactoring
Updated Examine Nuget to latest version 1.8.3
|
2017-05-16 09:14:02 -07:00 |
|
Jason Prothero
|
9a515de43f
|
Updated Examine Nuget to latest version 1.8.3
|
2017-05-16 09:12:50 -07:00 |
|
mikkelhm
|
69775c369a
|
Bump version to 7.5.14
|
2017-05-16 08:33:19 +02:00 |
|
mikkelhm
|
3f25d3637a
|
Bump version to 7.5.14
|
2017-05-16 08:32:33 +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 |
|
Sebastiaan Janssen
|
e7b007386a
|
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
|
2017-05-15 19:00:05 +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 |
|
Jason Prothero
|
b55d065d45
|
Update to mark some methods as Obsolete and not seen by the VS editor
|
2017-05-11 09:17:56 -07:00 |
|
Jason Prothero
|
fead30db38
|
Removed commented code for hash algorithm refactoring
|
2017-05-10 15:49:03 -07:00 |
|
Jason Prothero
|
d8811d6b46
|
Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5.
|
2017-05-10 13:35:28 -07:00 |
|
Mikkel Holck Madsen
|
080150baa3
|
Merge pull request #1924 from wanddy/dev-v7
Fix missing translation for some menu tree item
|
2017-05-10 21:18:58 +02: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 Deminick
|
99855bce11
|
Adds AppVeyor build badge
|
2017-05-10 14:51:40 +10:00 |
|
Shannon
|
d0b2f10a8c
|
U4-9836 CreatorId on a media is overwritten on save
|
2017-05-10 14:32:09 +10:00 |
|
Shannon Deminick
|
70507501bd
|
Merge pull request #1937 from AndyButland/u4-9836
U4-9836 - retains original media creator when media is updated
|
2017-05-10 14:31:34 +10:00 |
|
Shannon Deminick
|
bbfd570b8a
|
Merge pull request #1938 from suedeapple/U4-9886
U4 9886 - automaticly - > automatically (typo fix up)
|
2017-05-10 14:24:36 +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 |
|
mikkelhm
|
36e60c774f
|
Bump version to 7.6.1
|
2017-05-08 14:06:03 +02:00 |
|
mikkelhm
|
745252341f
|
Merge branch 'dev-v7' into dev-v7.6
# Conflicts:
# src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
|
2017-05-08 13:58:08 +02:00 |
|
Mikkel Holck Madsen
|
a2df4c5232
|
Merge pull request #1933 from umbraco/temp-U4-9864
U4-9864 Missing import and xss check in other PermissionEditor.aspx
|
2017-05-08 10:29:03 +02:00 |
|
Shannon Deminick
|
d012d8e8b6
|
Merge pull request #1925 from SaDa1337/dev-v7
fixed console error on media picker
|
2017-05-08 17:11:28 +10:00 |
|
Mikkel Holck Madsen
|
9318da2883
|
Merge pull request #1931 from umbraco/temp-U4-9849-2
U4-9849 Query Builder not working in template editor. Always returns …
|
2017-05-08 09:05:29 +02:00 |
|
Shannon Deminick
|
a08849f60a
|
Merge pull request #1935 from jamescoxhead/U4-9869
Fix typo error in upgrade installer
|
2017-05-08 13:40:36 +10:00 |
|
Shannon Deminick
|
9792d8df25
|
Merge pull request #1930 from TomSteer/U4-9852
Change Context to be public on MigrationBase
|
2017-05-08 13:39:06 +10:00 |
|