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

3044 Commits

Author SHA1 Message Date
Nathalie Festin
c6229e4fcb Adding login hint to Swedish language file 
Added usernamehint to placeholders
 2017-04-28 15:44:46 +02:00
Shannon
d24b0aa9eb oops undeletes a couple files that are still needed for the custom package ascx page 2017-04-28 10:30:47 +10:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Shannon
968d52e490 Removes old packager files that should absolutely never be used 2017-04-26 15:46:07 +10:00
Shannon
ebbe9f6ed0 Removes old packager files that should absolutely never be used 2017-04-26 15:45:37 +10:00
Shannon
ba32636fe7 Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267 2017-04-26 14:18:27 +10:00
Shannon
7cd385dd6b disables ssl by default 2017-04-26 14:17:24 +10:00
Stephan
4a38b8acd1 Fix broken refs to some libs 2017-04-24 10:50:25 +02: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
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
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
Sebastiaan Janssen
e2dc4f36ad U4-9762 ezSearch package complains about pickers in macro parameters 2017-04-12 13:39:38 +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
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
Warren Buckley
200497b865 Dictionary is the most common treepicker that may not have any items in core 2017-04-10 10:42:26 +01:00
Shannon
9f2c428a7c updates to latest Models Builder 2017-04-10 16:12:23 +10:00
Shannon
a958f946ef bumps version (beta) so i can post the patch release 2017-04-08 13:57:43 +10:00
Sebastiaan Janssen
372a2f5df4 Merge pull request #1870 from umbraco/temp-U4-8432 
U4-8432 Update log4net async appender to use the official log4net one
 2017-04-07 08:11:42 +02:00
Shannon Deminick
2c3693ac68 Merge pull request #1855 from abryukhov/patch-6 
Missing some new keys in 'create' area
 2017-04-07 12:28:33 +10:00
Shannon Deminick
7d90296e15 Merge pull request #1856 from abryukhov/patch-7 
New keys added to the 'create' area
 2017-04-07 12:28:17 +10:00
Shannon
bc8829ce14 U4-8432 Update log4net async appender to use the official log4net one 2017-04-07 12:08:16 +10:00
Shannon
e5af5bcc22 more binding redirects missing 2017-04-07 11:47:22 +10:00
Shannon
d1d98372cd Fixes binding redirects local transforms and nuget transforms 2017-04-07 11:37:23 +10:00
Sebastiaan Janssen
16582c8207 U4-9745 Update outdated NuGet dependencies 2017-04-06 16:27:41 +02:00
Alex Novgorodov
de9739118e Add basic xss prevention logic 2017-04-04 18:11:48 +03:00
Claus
2ed4948619 Merge pull request #1854 from umbraco/temp-U4-9720 
U4-9720 No more _thumb thumbnail file generation - all thumbnails should be generated via Image Processor
 2017-04-04 09:49:10 +02:00
Alexander Bryukhov
ce08749d85 New keys added to the 'create' area 2017-04-04 13:17:23 +07:00
Alexander Bryukhov
1eea1f5f8f Missing some new keys in 'create' area 
They are present in en.xml now, but not in en_us.xml
 2017-04-04 11:21:07 +07:00
Shannon Deminick
7b34e59222 Merge pull request #1851 from umbraco/temp-U4-9706 
fixes: U4-9706 Partial View Macro File is not created but Macro is
 2017-04-04 12:46:29 +10:00
Shannon
3706405bff Obsoletes all methods that perform image manipulation and thumbnail generation, removes thumbnail generation from occurring, fixes the issue of getting the size for an image!! Argh, we were bypassing the Exif data reading and instead still loading the whole image in! 2017-04-04 12:14:06 +10:00
Shannon
2248a85876 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Core/Services/ContentTypeService.cs
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
#	src/Umbraco.Web.UI/packages.config
 2017-04-03 21:50:22 +10:00
Mads Rasmussen
75a006ca87 move create macro logic from partial view macro file dialog to editor 2017-04-03 13:32:15 +02:00
Mads Rasmussen
7ce58f6e5f installer image is a jpg 2017-03-30 12:07:43 +02:00
Sebastiaan Janssen
8a28639331 Revert commit of test variable 2017-03-30 11:43:48 +02:00
Sebastiaan Janssen
2daf71aee4 Move LoginBackgroundImage to the content section instead of the security section 2017-03-30 11:15:12 +02:00
Sebastiaan Janssen
339edb2295 Merge branch 'dev-v7.6' into temp-U4-9687 2017-03-30 10:49:03 +02:00
Stephan
4677faff38 Upgrade to ModelsBuilder 3.0.6 2017-03-30 08:54:01 +02:00
Shannon
c5f388f6bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-03-30 17:03:51 +11:00
Shannon
6a1d60c5a7 U4-9692 Update to Examine 0.1.82 2017-03-30 15:43:06 +11:00
Niels Hartvig
d76a0271e9 Adds missing config element 2017-03-29 14:05:09 +02:00
Niels Hartvig
5deb483b94 U4-9694 Add support for specifying custom login background photo 2017-03-29 14:04:45 +02:00
Shannon
cb539e82d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
#	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2017-03-29 18:11:51 +11:00
Shannon Deminick
1432d602ba Merge pull request #1838 from umbraco/temp-u4-9665 
u4-9665
 2017-03-29 18:06:28 +11:00
Shannon
7cdb48b6c9 bumps version 2017-03-29 16:35:37 +11:00