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

20429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarne Fyrstenborg
b938685db0 Ensure longer text in user box is wrapped in IE, e.g. "Migrated Section Access Group 1" 2017-09-21 23:25:40 +02:00
Bjarne Fyrstenborg
39498ad362 Center avatar horizontally in IE 2017-09-21 23:24:10 +02:00
Sebastiaan Janssen
92b6e276bf U4-10443 Remove xmlrpcnet from nuspec 2017-09-21 08:44:59 +02:00
Stephan
a239e92bc0 Fix LocalDb detection on 32/64 bits systems 2017-09-21 08:32:49 +02:00
Sebastiaan Janssen
e0025db56d Merge remote-tracking branch 'origin/dev-v7.7' into dev-v7 2017-09-21 08:26:59 +02:00
Shannon Deminick
7142222234 Merge pull request #2201 from wanddy/dev-v7 
Improve Chinese translation
 2017-09-20 09:36:30 +10:00
Sebastiaan Janssen
fd35d89949 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-19 18:51:23 +02:00
Sebastiaan Janssen
1b3fc9fb21 Oops! Add -docs for all the log file pipes 2017-09-19 18:37:00 +02:00
Sebastiaan Janssen
2e98651d62 Create the out and tmp folders correctly 2017-09-19 18:16:19 +02:00
Sebastiaan Janssen
704e981284 Always do the node/bower/gulp build to get docs, start with node build first 2017-09-19 18:15:31 +02:00
Sebastiaan Janssen
0070d8b913 Bump version 2017-09-19 14:23:58 +02:00
Sebastiaan Janssen
9c0500325d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-19 14:23:26 +02:00
Sebastiaan Janssen
eda7f1e527 Bump version 2017-09-19 14:17:19 +02:00
Sebastiaan Janssen
018a066f86 U4-10428 Can't drag Image in Image Cropper (in Umbraco 7.6.7) 2017-09-19 14:10:20 +02:00
Sebastiaan Janssen
e33a28ac19 Making sure we don't build Belle twice for the documentation 2017-09-19 11:38:20 +02:00
Wanddy Huang(黄仁祥)
0f17a27d86 Improve Chinese translation 
Improve Chinese translation.
 2017-09-19 15:56:47 +08:00
Wanddy Huang(黄仁祥)
9c24dc71a4 Merge pull request #2 from umbraco/dev-v7 
Merge from origin source
 2017-09-19 15:49:16 +08:00
Shannon
6205d8a9f9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2017-09-19 13:34:08 +10:00
Shannon
0ef57d819c removes uneeded null checks from AuthenticationController for raising UserManager events 2017-09-19 13:31:43 +10:00
Sebastiaan Janssen
0dfbe4d4eb Bump version 2017-09-18 23:08:32 +02:00
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):

![image](https://user-images.githubusercontent.com/3634580/30523147-64c23ce0-9bdc-11e7-9a48-8d2de93fce72.png)
 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