Commit Graph

18693 Commits

Author SHA1 Message Date
Sebastiaan Janssen
e88f5c8fe2 Better way to get current user's IP address 2017-04-30 10:59:00 +02:00
Sebastiaan Janssen
7cb1a497e5 Merge remote-tracking branch 'origin/dev-v7.6' into temp-seb-authevents
# Conflicts:
#	src/Umbraco.Core/Security/BackOfficeSignInManager.cs
2017-04-30 10:17:07 +02:00
Sebastiaan Janssen
b72c8ef953 Get userId more easily - also changed the default to -1 just in case we can't determine the Id (at least then changes won't be "blamed" on user 0 2017-04-30 10:15:53 +02:00
Shannon
73209d7e2c Merge branch 'dev-v7' into dev-v7.6 2017-04-30 17:13:14 +10:00
Shannon Deminick
cf8ead62ac Merge pull request #1904 from jwoods1/patch-2
Fixed issue on line 216
2017-04-30 17:11:44 +10:00
Shannon Deminick
8461aea7d8 Merge pull request #1907 from wanddy/dev-v7
Improve Chinese translation.
2017-04-30 17:10:58 +10:00
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
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
04a09bd4d6 Updates comment 2017-04-29 23:19:35 +02:00
Sebastiaan Janssen
311fcfe328 Adds AccountCreated event 2017-04-29 23:17:50 +02:00
Sebastiaan Janssen
33d09b14be Refactor GetBackofficeUserManager calls 2017-04-29 22:21:42 +02:00
Sebastiaan Janssen
cdab89062e Make sure to only trigger events on MembershipHelper when we're dealing with backoffice users 2017-04-29 22:10:43 +02:00
Sebastiaan Janssen
38571f2cdd Wire up LoginSuccess and LoginRequiresVerification 2017-04-29 13:43:51 +02:00
Sebastiaan Janssen
fcd90aa702 Get IP address from OWIN 2017-04-29 12:51:09 +02:00
Sebastiaan Janssen
ae17172126 Attempt to raise events from parts of code that don't hit the BackOfficeUserManager directly 2017-04-29 12:49:56 +02:00
Sebastiaan Janssen
ecca480334 Get backoffice identity from cookie instead of grabbing it from database 2017-04-29 12:25:35 +02: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
Sebastiaan Janssen
9fa76a0133 Merge pull request #1911 from umbraco/temp-U4-9812
U4-9812 FailedLoginAttempts should be reset to 0 after a successfull …
2017-04-29 10:19:26 +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
Sebastiaan Janssen
095a7c0aa7 First attempt at hooking up some events for auditing 2017-04-28 13:20:42 +02:00
Sebastiaan Janssen
3242b31a8a U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt 2017-04-28 12:46:58 +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
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
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
Jason Woods
f737004544 Removed space before svalue 2017-04-27 16:13:41 -06:00
Jason Woods
850e354b11 wrapped all values in double quotes
Wrapped image src and crop values in double quotes to keep consistent across all saves and updates.
2017-04-27 16:03:45 -06: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