Sebastiaan Janssen
|
d0e99bf5d9
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-18 22:31:20 +02:00 |
|
Sebastiaan Janssen
|
c321d6dd44
|
Adds files missing from build output
|
2017-09-18 16:52:43 +02:00 |
|
Sebastiaan Janssen
|
48f2aa4f15
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-09-18 14:19:47 +02:00 |
|
Sebastiaan Janssen
|
5d74e61bcf
|
Bump version
|
2017-09-18 14:16:57 +02:00 |
|
Shannon
|
029ace796d
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
|
2017-09-18 20:04:05 +10:00 |
|
Shannon
|
8b39f495e5
|
Simplifies the UnlockUser method so we don't have to have it in the BackOfficeUserManager
|
2017-09-18 19:59:23 +10:00 |
|
Shannon
|
a5581ba13e
|
ensures the UsersController raises the appropriate event when an admin user changes another user's password
|
2017-09-18 19:42:49 +10:00 |
|
Shannon
|
e8e0664129
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7, removes the UnlockUser method of BackOfficeUserManager since the membership provider is no longer used to perform any unlocking
|
2017-09-18 19:38:10 +10:00 |
|
Shannon
|
d468e346f1
|
reverts changes made to UmbracoMembershipProvider and adds another virtual internal method that the UsersMembershipProvider overrides, so now all of the event raising is done in the user specific provider.
|
2017-09-18 19:01:00 +10:00 |
|
Shannon
|
2a10eed059
|
Moves raising events for reseting/changing password out of the MembershipHelper ChangePassword method and to the places where it is being called
|
2017-09-18 16:56:43 +10:00 |
|
Shannon
|
4ec04c779a
|
Adds notes about the UnlockUser method as we'll need to change this in 7.7
|
2017-09-18 16:29:29 +10:00 |
|
Shannon
|
26034fa33f
|
Changes ResetAccessFailedCountAsync in BackOfficeUserManager to use Identity APIs
|
2017-09-18 16:24:23 +10:00 |
|
Shannon
|
97ddbdb1f0
|
Makes IdentityAuditEventArgs immutable and injects all required values, makes the events strongly typed.
|
2017-09-18 16:17:54 +10:00 |
|
Shannon
|
20290582d9
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-18 15:37:23 +10:00 |
|
Shannon Deminick
|
731c51bfc7
|
Merge pull request #2200 from abjerner/patch-21
Just had to have #2200 (Danish translations for the user section in Umbraco 7.7)
|
2017-09-18 15:05:43 +10:00 |
|
Shannon Deminick
|
78cb085e00
|
Merge pull request #2199 from abjerner/patch-20
Added missing Danish translation for "searchNoResult" in "general
|
2017-09-18 15:05:01 +10:00 |
|
Shannon Deminick
|
f2ea4596d7
|
Merge pull request #2198 from abjerner/patch-19
Added translations for labels when creating a new partial view
|
2017-09-18 15:04:10 +10:00 |
|
Shannon Deminick
|
f9d5de7af4
|
Merge pull request #2197 from abjerner/patch-18
Added Danish translation for "remove" in "general"
|
2017-09-18 15:03:38 +10:00 |
|
Anders Bjerner
|
04c6fd0947
|
Added Danish translation for "enabled" in the "actions" section
Also used in the new users section
|
2017-09-17 22:47:05 +02:00 |
|
Anders Bjerner
|
8bcf35734d
|
Added some missing Danish translations for the new user section
There appears to be some hardcoded labels here and there, which may be for another pull request.
|
2017-09-17 22:45:38 +02:00 |
|
Anders Bjerner
|
4de7da2ac1
|
Added missing translation for "searchNoResult"
Used in Umbraco's list views when the search query doesn't match any items
|
2017-09-17 22:24:22 +02:00 |
|
Anders Bjerner
|
67d12ae2ca
|
Added translations for labels when creating a new partial view
I think "partial view" and "snippet" still makes sense in Danish, so I've only translated the text around it.
|
2017-09-17 22:17:37 +02:00 |
|
Anders Bjerner
|
e8ba069051
|
Added Danish translation for "remove" in "general"
The Danish translation is missing in both 7.6 and 7.7 beta. The label is used by the new content picker (and probably other parts of Umbraco as well):
|
2017-09-17 19:15:02 +02:00 |
|
Sebastiaan Janssen
|
bb88eb155f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Security/BackOfficeSignInManager.cs
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
|
2017-09-15 16:34:51 +02:00 |
|
Sebastiaan Janssen
|
a3457d2498
|
Merge pull request #1923 from umbraco/temp-U4-8634
U4-8634 Usermanagement - Proper auditing of user events instead of just adding log entries
|
2017-09-15 15:13:14 +02:00 |
|
Sebastiaan Janssen
|
388d660e11
|
Raise event when login succeeds after 2FA challenge. Raise event when locked out during 2FA attempts.
|
2017-09-15 15:12:40 +02:00 |
|
Sebastiaan Janssen
|
b6dbc245e2
|
Merge branch 'dev-v7' into temp-U4-8634
|
2017-09-15 13:57:46 +02:00 |
|
Sebastiaan Janssen
|
3efba6b576
|
Update title of preview window
|
2017-09-15 13:52:26 +02:00 |
|
Sebastiaan Janssen
|
3803785569
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-15 13:51:23 +02:00 |
|
Sebastiaan Janssen
|
54407a66a4
|
Fixes canvas designer
|
2017-09-15 13:50:43 +02:00 |
|
Sebastiaan Janssen
|
3f82781c0f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-14 16:15:43 +02:00 |
|
Sebastiaan Janssen
|
bca46f11ad
|
Makes the sort order input same size as the one on tabs
|
2017-09-14 16:11:23 +02:00 |
|
Warren Buckley
|
a86b8f786d
|
Merge pull request #1817 from marcemarc/temp-U4-6738
Relates to Issue U4-6738 - Allow viewing/sorting of composition properties.
|
2017-09-14 14:55:48 +01:00 |
|
Warren Buckley
|
ac3eaf43cb
|
Forgot to revert the logic for the extra button/label click to show the sort order on properties
|
2017-09-14 14:16:47 +01:00 |
|
Robert
|
f6d4170010
|
Merge pull request #1633 from bjarnef/dev-v7-U4-9149
fixes: U4-9149 - Fix z-index of focal point
|
2017-09-14 15:15:51 +02:00 |
|
Warren Buckley
|
2b0ea45da9
|
Remove the extra button/click in the UI & show the property sortOrder value when we are sorting
|
2017-09-14 14:13:42 +01:00 |
|
Warren Buckley
|
07d05c9e0d
|
Revert "toggle the show ordinals label button to hide, when in show ordinal mode"
This reverts commit 51215f11af.
|
2017-09-14 14:09:00 +01:00 |
|
Warren Buckley
|
26a5682a14
|
Revert "add language translations keys for showOrdinals and hideOrdinals"
This reverts commit 8ab2f7c257.
|
2017-09-14 14:08:00 +01:00 |
|
Sebastiaan Janssen
|
5ab364781b
|
Sync en and en_us language
|
2017-09-14 14:29:53 +02:00 |
|
Sebastiaan Janssen
|
c2d328685d
|
Remove wrong and misleading translation key that's unused
|
2017-09-14 14:29:26 +02:00 |
|
Mads Rasmussen
|
c013be4f36
|
add missing language keys for en_us.xml
|
2017-09-14 14:04:25 +02:00 |
|
Sebastiaan Janssen
|
f3fc2bcfb8
|
Merge pull request #2177 from umbraco/temp-U4-10384
U4-10384 Error when changing content type on media item
|
2017-09-14 13:46:32 +02:00 |
|
Robert
|
c8d49ed5a7
|
Merge pull request #2195 from umbraco/temp-U4-10413
fixes: U4-10413 Composition/Reorder bar gets in the way when editing …
|
2017-09-14 11:41:04 +02:00 |
|
Mads Rasmussen
|
9c2b0a3ef6
|
fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property
|
2017-09-14 11:04:34 +02:00 |
|
Shannon
|
703c3eefe8
|
Fixes issue with trying to log in as a user that is disabled.
|
2017-09-14 19:00:59 +10:00 |
|
Shannon
|
4ab67d8cff
|
fix build
|
2017-09-14 18:28:02 +10:00 |
|
Shannon
|
f8d165599d
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-14 18:10:59 +10:00 |
|
Stephan
|
9355a81716
|
comments
|
2017-09-14 10:08:35 +02:00 |
|
Per Ploug
|
87575e9067
|
Reverting grid config
|
2017-09-14 10:04:04 +02:00 |
|
Sebastiaan Janssen
|
a5b31e94b6
|
Merge pull request #2194 from umbraco/temp-U4-10409
temp - vsts troubleshooting
|
2017-09-14 09:32:04 +02:00 |
|
