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

18587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Claus
92dad1af1c Merge branch 'AndyButland-u4-9652' into dev-v7.6 2017-04-20 10:25:36 +02: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
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 Deminick
5bb7223a79 Merge pull request #1890 from umbraco/temp-u4-9782 
u4-9782 - Adds assemblyRedirect for log4net in the nuget upgrade transform
 2017-04-19 20:29:22 +10:00
mikkelhm
c9a816f25e Adds assemblyRedirect for log4net in the nuget upgrade transform 2017-04-19 12:21:49 +02: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
d5a71ec1da Adds important note for 7.6 upgrades to the nuget upgrade doc 2017-04-19 16:05:24 +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 Deminick
e322ab6f75 Merge pull request #1879 from umbraco/temp-U4-7009 
U4-7009 Changing passwords design oversight
 2017-04-18 20:15:33 +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 Deminick
1ca825de62 Merge pull request #1886 from JimBobSquarePants/filesystem-docs 
Document the IFileSystem interface
 2017-04-18 13:05:35 +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
Warren Buckley
5c558b0eeb Merge pull request #1881 from umbraco/temp-U4-9762 
U4-9762 ezSearch package complains about pickers in macro parameters
 2017-04-13 11:26:20 +01:00
Emil Wangaa
298e56ad05 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-12 14:24:27 +02:00
Emil Wangaa
d74d2cd945 Fixes U4-9732 Insert Value in new template editor missing standard metadata fields 2017-04-12 14:24:10 +02:00
Sebastiaan Janssen
e2dc4f36ad U4-9762 ezSearch package complains about pickers in macro parameters 2017-04-12 13:39:38 +02:00
Sebastiaan Janssen
9620c902cc Merge pull request #1878 from umbraco/temp-U4-9761 
Fixes U4-9761: Creating a new partial view saves the file with a wrong path
 2017-04-11 22:04:29 +02:00
Sebastiaan Janssen
abda579da6 Merge pull request #1875 from umbraco/temp-U4-9753 
fixes: U4-9753 When uploading, moving or deleting folders in the medi…
 2017-04-11 22:00:40 +02:00
Sebastiaan Janssen
2e43e97ae2 Merge pull request #1867 from umbraco/temp-U4-9722 
fixes: U4-9722 7.6 RC layout issues
 2017-04-11 21:51:24 +02:00
Sebastiaan Janssen
c7ac3e7691 Merge pull request #1873 from umbraco/temp-U4-9749 
fixes: U4-9749 Clean up ace themes and modes
 2017-04-11 21:41:00 +02:00
Sebastiaan Janssen
a209a2067c Merge pull request #1874 from umbraco/temp-U4-9751 
fixes: U4-9751 "Your recycle bin is empty" shows when folders are add…
 2017-04-11 21:38:04 +02:00
Sebastiaan Janssen
b1c6276a67 U4-7009 Changing passwords design oversight 2017-04-11 20:53:34 +02:00
Mads Rasmussen
3950b35539 Merge pull request #1877 from umbraco/temp-U4-9756 
U4-9756 Tree Picker Overlay - Support for emptystate message
 2017-04-11 15:22:27 +02:00
Emil Wangaa
2f63364925 Fixes issue with creating new partial being saved with wrong path 2017-04-11 13:26:54 +02:00
Sebastiaan Janssen
376c78381d One more.. Reverts CodeAnalysis update to stay compatible with Models builder 2017-04-10 15:02:04 +02:00
Sebastiaan Janssen
0a09810f0f Reverts CodeAnalysis update to stay compatible with Models builder 2017-04-10 13:45:34 +02:00
Sebastiaan Janssen
43018e2793 Reverts CodeAnalysis update to stay compatible with Models builder 2017-04-10 13:35:20 +02:00