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

20443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
7e25501ac5 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-27 10:08:44 +02:00
Sebastiaan Janssen
4b581a2182 Merge pull request #2217 from umbraco/temp-U4-10470 
U4-10470 Missing transform for the scripts tree when upgrading
 2017-09-27 10:06:08 +02:00
Claus
581eac5369 U4-10470 Missing transform for the scripts tree when upgrading 2017-09-27 10:04:07 +02:00
Shannon Deminick
c941ff093c Merge pull request #2216 from rasmusjp/patch-1 
Fix incorrect closed div
 2017-09-27 08:30:07 +10:00
Rasmus
60f9490892 Fix incorrect closed div 2017-09-26 22:28:13 +02:00
Niels Hartvig
78e5d6d3ad Merge pull request #2203 from umbraco/temp-U4-10435 
U4-10435 Unable to Change Username (Reverts After Save)
 2017-09-26 11:15:39 +02:00
Sebastiaan Janssen
33cf983cae Bump version 2017-09-25 11:19:36 +02:00
Shannon
3ce6eb09aa Ensures HealthCheckController is authorized to user with developer access 
(cherry picked from commit 7c4eb71f07)
 2017-09-25 10:48:15 +02:00
Stephan
963015cf4a Fix LocalDb detection on 32/64 bits systems 
(cherry picked from commit a239e92bc0)
 2017-09-25 10:47:38 +02:00
Sebastiaan Janssen
cc35af4eab Merge pull request #2209 from umbraco/temp-deploy-401 
deploy-401 - fix id reservations
 2017-09-25 10:46:05 +02:00
Shannon
7c4eb71f07 Ensures HealthCheckController is authorized to user with developer access 2017-09-25 14:49:59 +10:00
Sebastiaan Janssen
c9ea1a5504 Copy Azure Gallery script to output folder 2017-09-22 17:03:20 +02:00
Sebastiaan Janssen
10da318989 Get-FileHash is now unused 2017-09-22 16:54:34 +02:00
Sebastiaan Janssen
74e3308017 Adds Azure Gallery release script - no more need for WebPI builds 2017-09-22 16:52:04 +02:00
Stephan
349d89e4d7 deploy-401 - fix id reservations 2017-09-22 13:08:05 +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
Sebastiaan Janssen
7cd632302b Only sync the email and username when UsernameIsEmail is true - U4-10435 Unable to Change Username (Reverts After Save) 2017-09-20 13:34:19 +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