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 |
|
Shannon Deminick
|
85467976ad
|
Merge pull request #1913 from umbraco/temp-U4-9824-v76
Change username to email in login dialog
|
2017-04-30 17:04:16 +10:00 |
|
Alexander Bryukhov
|
d7e93fe466
|
Adding 'usernameHint' key to ru.xml lang file
|
2017-04-30 11:56:47 +07:00 |
|
Sebastiaan Janssen
|
660f048b4f
|
U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt
(cherry picked from commit 3242b31a8a)
|
2017-04-29 10:22:57 +02: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 |
|
Niels Hartvig
|
d1e6c0e835
|
Change username to email in login dialog
|
2017-04-28 13:37:19 +02:00 |
|
Stephan
|
244977dc95
|
packages - trace errors
|
2017-04-28 13:34:35 +02:00 |
|
Stephan
|
efc3261163
|
scope - dont break
|
2017-04-28 11:43:48 +02:00 |
|
Stephan
|
8c6aa9875d
|
scope - dont rename
|
2017-04-28 11:26:41 +02:00 |
|
Stephan
|
f89ce1ff26
|
scope - cleanup
|
2017-04-28 10:58:57 +02: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
|
9f505a7976
|
bumps to rc3 version
|
2017-04-28 08:27:31 +10:00 |
|
Shannon
|
1b27114014
|
Merge branch 'temp-CON-1267' into dev-v7.6
|
2017-04-28 07:53:16 +10:00 |
|
Shannon Deminick
|
d8b235ad62
|
Merge pull request #1906 from umbraco/temp-CON-1267
CON-1267 Update Our to not offer v6 to people on < 7.6.0
|
2017-04-28 07:52:19 +10:00 |
|
Shannon
|
56581478c8
|
Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267
|
2017-04-28 07:48:04 +10:00 |
|
Shannon
|
2be330d237
|
adds notes, changes to protected
|
2017-04-28 07:45:01 +10:00 |
|
Shannon
|
4381a700ba
|
Updates UmbracoVirtualNodeRouteHandler to have a new protected GetUmbracoContext method used to get the umb context used in the rest of the code
|
2017-04-28 07:38:03 +10:00 |
|
Shannon
|
99821954f1
|
adds notes
|
2017-04-28 07:31:44 +10:00 |
|
Shannon Deminick
|
10a15be8ad
|
Merge pull request #1901 from tompipe/U4-9384-StaleVariableFix
Quick/simple fix for the stale variable
|
2017-04-28 07:28:00 +10:00 |
|
Stephan
|
d1094eea7a
|
Merge pull request #1905 from umbraco/temp-tasks
Publicize more IBackgroundTask plumbing
|
2017-04-27 14:46:33 +02:00 |
|
Shannon
|
c629a50f39
|
Fixes entity service and figuring out which GUID to go with which object type
|
2017-04-27 13:29:31 +10:00 |
|
Shannon
|
430f906ae6
|
Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267
|
2017-04-27 13:28:34 +10:00 |
|
Shannon
|
736798c769
|
Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267
# Conflicts:
# src/Umbraco.Core/Exceptions/ConnectionException.cs
# src/Umbraco.Core/Services/PackagingService.cs
# src/Umbraco.Web/Editors/PackageInstallController.cs
|
2017-04-27 13:27:23 +10:00 |
|
Shannon
|
e913034d93
|
Changes PackagingService to not have a different base class since it was not needed
|
2017-04-27 13:21:56 +10:00 |
|
Shannon
|
bed5f8a03b
|
backports updates from 7.6 so that the packages.umbraco.org endpoint is not used for fetching package files any longer
|
2017-04-27 13:21:07 +10:00 |
|
Stephan
|
0291ab615d
|
Fix shadow wrapper cleanup
|
2017-04-26 17:38:06 +02:00 |
|
Stephan
|
ceeea7827e
|
Fix shadow wrapper cleanup
|
2017-04-26 14:44:48 +02:00 |
|
Shannon
|
756b4d24c0
|
Updates endpoint to include hidden package files
|
2017-04-26 22:10:34 +10:00 |
|
Stephan
|
ffe3fc9257
|
deploy-293 - fix normalization
|
2017-04-26 13:25:54 +02:00 |
|
Shannon
|
26bd3c7c0b
|
removes unneeded closing of stream since it's disposed
|
2017-04-26 19:42:58 +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 |
|
Stephan
|
ba489afe9a
|
Publicize more IBackgroundTask plumbing
|
2017-04-26 09:07:48 +02: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
|
a6f9d14a1b
|
Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267
|
2017-04-26 14:18:05 +10:00 |
|