Tom Pipe
67e3ec2ae0
Quick/simple fix for the stale variable
...
The umbracoContext variable can hold a null reference to UmbracoContext.Current.
If a request containing a file extension is passed through an UmbracoVirtualNodeRouteHandler, the UmbracoContext will be null, because a context is never created for urls containing extensions due to 5397f2c53a/src/Umbraco.Core/UriExtensions.cs (L143)
2017-04-24 13:23:12 +01:00
Warren Buckley
d6272b0cdb
Merge branch 'temp-U4-9760' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9760
2017-04-24 13:19:36 +01:00
Warren Buckley
ce7dd19a8f
Updates the template controller save method - to take into account if the master you are updating to is a sub master that has children that there path's need updating too
2017-04-24 13:19:30 +01:00
Shannon
d295174e53
Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in.
2017-04-24 21:31:35 +10:00
Mads Rasmussen
55022e2aaf
fix removeNode check to only be for the root node
2017-04-24 12:46:45 +02:00
Warren Buckley
4ffca2e4bf
Merge pull request #1900 from umbraco/temp-deploy-103
...
deploy-103 - fix PublicAccessRepository
2017-04-24 09:53:52 +01:00
Stephan
4a38b8acd1
Fix broken refs to some libs
2017-04-24 10:50:25 +02:00
Stephan
d93b8b869e
deploy-103 - fix PublicAccessRepository
2017-04-21 16:02:29 +02:00
Shannon
bec4e442fb
bumps to RC1
2017-04-21 17:45:27 +10:00
Shannon Deminick
da8c46e426
Merge pull request #1859 from alexxn/dev-v7
...
Add basic xss prevention logic
2017-04-21 13:05:40 +10:00
Shannon
72cc5ce88b
Moves binding redirects to pre app startup
2017-04-21 12:15:36 +10:00
Shannon Deminick
63763d025e
Merge pull request #1897 from umbraco/temp-u4-9798
...
u4-9798 - Moves LockTable and LockObject Migrations to 7.6
2017-04-21 11:28:37 +10:00
mikkelhm
f76fa6bde6
Moves LockTable and LockObject Migrations to 7.6
2017-04-20 23:42:15 +02:00
Warren Buckley
c34a1060f7
When we create a brand new template & set a master template we were removing the entire tree for templates - this adds in a check to not do the remove of the old node if its a brand new template we are creating
2017-04-20 15:49:49 +01:00
Warren Buckley
a231cedd8e
Merge pull request #1895 from umbraco/temp-U4-9795
...
fixes: U4-9795 Update alert in public access dialog to follow same conventions as other alerts
2017-04-20 15:12:12 +01:00
Mads Rasmussen
20526b40bf
fixes: U4-9789 Email input type is not same height as text input type
2017-04-20 12:03:29 +02:00
Mads Rasmussen
5008a2be7f
update class on notification
2017-04-20 11:29:16 +02:00
Mads Rasmussen
03a395d1f9
remove unnecessary break from language file
2017-04-20 11:02:49 +02:00
Mads Rasmussen
734df8685d
update notification to use alert class instead of custom error class
2017-04-20 10:57:57 +02:00
AndyButland
11b97c5291
Removed unnecessary null check
2017-04-20 09:45:48 +01:00
Claus
d897e78b27
Merge branch 'u4-9652' of git://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9652
...
# Conflicts:
# src/Umbraco.Core/Services/EntityService.cs
2017-04-20 10:23:54 +02:00
Shannon Deminick
d79115fcdf
Merge pull request #1892 from umbraco/temp-deploy-103
...
deploy-103 - support member groups in entity service
2017-04-20 11:35:13 +10:00
Shannon Deminick
992073ab4e
Merge pull request #1888 from umbraco/temp-U4-9717
...
fixes: U4-9717 7.6 "Do something else"-button
2017-04-20 11:00:49 +10:00
Shannon
3c9b144927
updates log4net binding redirect to disregard the signing token so it can be null or can be any token and it will redirect
2017-04-20 10:50:16 +10:00
AndyButland
b7e4f58503
Ensured EntityService GetKeyById and GetIdByKey respect passed object type
2017-04-19 18:38:24 +01:00
Stephan
5880df3859
U4-9764 - add FirstChild with predicate extension
2017-04-19 18:56:12 +02:00
Stephan
c11dce7b6e
deploy-103 - support member groups in entity service
2017-04-19 17:20:44 +02:00
Mads Rasmussen
004a3e2808
Merge pull request #1882 from umbraco/temp-U4-9769
...
U4-9769 - BG Color change for installer to purple hue
2017-04-19 14:42:43 +02:00
Mads Rasmussen
d05bfc8983
use same purple as the login screen
2017-04-19 14:39:38 +02:00
Shannon
13cfb42287
Resizes LoginName column so that it can be indexed but only if the data in the column doesn't exceed a max size
2017-04-19 20:16:43 +10:00
Mads Rasmussen
334fcf38ec
fixes: U4-9780 Use email input type for password reset
2017-04-19 11:25:14 +02:00
Mads Rasmussen
8873d0f79d
fixes: U4-9717 7.6 "Do something else"-button
2017-04-19 10:04:55 +02:00
Shannon
b499b45a5c
fixes test
2017-04-19 16:09:59 +10:00
Shannon
1402494e47
Reverts changes made for U4-8963
2017-04-19 15:41:26 +10:00
Shannon
7c491c1fc1
U4-9768 Examine Management dashboard indexers and searchers not in same order
2017-04-19 14:53:46 +10:00
Shannon
460dd69884
updates the is multiple check to check for default pre-values since those won't be persisted
2017-04-19 14:38:48 +10:00
Shannon
beda99963e
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7.6
2017-04-19 14:36:28 +10:00
Shannon
b06f16f5f7
Fixes issues with U4-7318
2017-04-19 14:36:23 +10:00
Shannon Deminick
f9d79871b4
Merge pull request #1837 from Jeavon/U4-9684
...
U4-9684 UDI Media Picker Value Converter should cache prevalues
2017-04-19 14:35:29 +10:00
Shannon
777b02b84c
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/IO/IFileSystem.cs
# src/Umbraco.Core/Media/ImageHelper.cs
# src/Umbraco.Core/Models/ContentExtensions.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web.UI/packages.config
2017-04-18 20:17:59 +10:00
Shannon
d19bebc404
Merge branch 'dev-v7.6' into temp-U4-7009
2017-04-18 20:10:27 +10:00
Shannon
46dd86c745
Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method
2017-04-18 20:09:27 +10:00
Shannon Deminick
62af834176
Merge pull request #1876 from jwoods1/patch-1
...
The form closing tag
2017-04-18 13:17:12 +10:00
Shannon
2dac1b3cf5
Merge branch 'normalize-stream-seek' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-normalize-stream-seek
...
# Conflicts:
# src/Umbraco.Core/Media/ImageHelper.cs
2017-04-18 13:11:44 +10:00
Shannon Deminick
68fb951283
Merge pull request #1885 from JimBobSquarePants/fix-image-memoryleak
...
EncodingParameters implements IDisposable
2017-04-18 13:08:04 +10:00
Shannon
13ccd86192
Adds another check for not being able to read the index
2017-04-18 12:35:21 +10:00
Shannon
336266c0eb
U4-9775 AlreadyClosedException is thrown when retrieving media if the app domain is currently in a shutdown state and the site is under heavy load
2017-04-18 12:32:44 +10:00
James Jackson-South
54b57f7d51
Document the IFileSystem interface
2017-04-15 17:21:48 +10:00
James Jackson-South
2f6e161120
EncodingParameters implements IDisposable
2017-04-15 16:41:24 +10:00
Warren Buckley
379bbe5bc4
Change background color to purple to the overlay solid color before we login to backoffice at end of installer
2017-04-13 12:06:48 +01:00
