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

3062 Commits

Author SHA1 Message Date
Shannon Deminick
034de1651b Merge pull request #1910 from abryukhov/patch-9 
ru.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:30 +10:00
Shannon Deminick
dcb8aa7e56 Merge pull request #1909 from abryukhov/patch-8 
en_us.xml - Missing newest area & key from en.xml
 2017-04-30 17:09:15 +10:00
Shannon Deminick
e8a52a95da Merge pull request #1914 from dawoe/patch-1 
Added dutch translation for usernameHint
 2017-04-30 17:08:42 +10:00
Shannon Deminick
42c99e0f07 Merge pull request #1916 from stelim/patch-1 
Adding login hint to German language file
 2017-04-30 17:08:29 +10:00
Shannon Deminick
a31b368b60 Merge pull request #1919 from NathalieLarsson/patch-1 
Adding login hint to Swedish language file
 2017-04-30 17:05:29 +10:00
Shannon Deminick
77f6d28a74 Merge pull request #1920 from camaya/patch-1 
Add Spanish translation for usernameHint
 2017-04-30 17:04:56 +10:00
Shannon Deminick
0b8d3ef214 Merge pull request #1921 from mikecp/patch-1 
Adding login hint to French language file
 2017-04-30 17:04:44 +10:00
Shannon Deminick
a4f83f9c00 Merge pull request #1922 from abryukhov/patch-10 
Adding 'usernameHint' key to ru.xml lang file
 2017-04-30 17:04:30 +10:00
Alexander Bryukhov
d7e93fe466 Adding 'usernameHint' key to ru.xml lang file 2017-04-30 11:56:47 +07:00
Michael Latouche
444c444f0e Adding login hint to French language file 2017-04-29 00:03:57 +02:00
Cristhian Amaya
383bbbe7e0 Add Spanish translation for usernameHint 2017-04-28 15:19:27 -05:00
Nathalie Festin
c6229e4fcb Adding login hint to Swedish language file 
Added usernamehint to placeholders
 2017-04-28 15:44:46 +02:00
Stefan Limbacher
187354f0bd Adding login hint to German language file 2017-04-28 14:29:13 +02:00
Dave Woestenborghs
2f540b1bfa Translated the usually part 2017-04-28 14:25:21 +02:00
Dave Woestenborghs
b1f104d1de Changed it to be more consisten 
Changed to be more consistent with other dutch translations
 2017-04-28 14:24:10 +02:00
Dave Woestenborghs
ba5fcad09a Added dutch translation for usernameHint 2017-04-28 14:17:51 +02:00
Niels Hartvig
d553eb2978 Change it back to username and then with a hint for email (for backwards compat.) 2017-04-28 13:57:29 +02:00
Alexander Bryukhov
46078a841c Missing newest area & key from en.xml 2017-04-28 11:43:50 +07:00
Alexander Bryukhov
0eb5e5f6e4 Missing newest area & key from en.xml 2017-04-28 11:41:20 +07: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