Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ac496b0cf6 | |||
| 6036136938 | |||
| f4eb37d44d | |||
| c79aaa9c48 | |||
| 6aa00c52dc | |||
| 30f63eefb3 | |||
| 6114193fd5 | |||
| 82420605ef |
@@ -1,3 +1,3 @@
|
|||||||
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
|
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
|
||||||
7.6.0
|
7.6.0
|
||||||
beta
|
beta02
|
||||||
|
|||||||
+1
-1
@@ -12,4 +12,4 @@ using System.Resources;
|
|||||||
[assembly: AssemblyVersion("1.0.*")]
|
[assembly: AssemblyVersion("1.0.*")]
|
||||||
|
|
||||||
[assembly: AssemblyFileVersion("7.6.0")]
|
[assembly: AssemblyFileVersion("7.6.0")]
|
||||||
[assembly: AssemblyInformationalVersion("7.6.0-beta")]
|
[assembly: AssemblyInformationalVersion("7.6.0-beta02")]
|
||||||
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
|
|||||||
/// Gets the version comment (like beta or RC).
|
/// Gets the version comment (like beta or RC).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The version comment.</value>
|
/// <value>The version comment.</value>
|
||||||
public static string CurrentComment { get { return "beta"; } }
|
public static string CurrentComment { get { return "beta02"; } }
|
||||||
|
|
||||||
// Get the version of the umbraco.dll by looking at a class in that dll
|
// Get the version of the umbraco.dll by looking at a class in that dll
|
||||||
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
|
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
|
||||||
|
|||||||
@@ -47,5 +47,9 @@ using System.Security.Permissions;
|
|||||||
[assembly: InternalsVisibleTo("Umbraco.Deploy.UI")]
|
[assembly: InternalsVisibleTo("Umbraco.Deploy.UI")]
|
||||||
[assembly: InternalsVisibleTo("Umbraco.Deploy.Cloud")]
|
[assembly: InternalsVisibleTo("Umbraco.Deploy.Cloud")]
|
||||||
|
|
||||||
|
[assembly: InternalsVisibleTo("Umbraco.Forms.Core")]
|
||||||
|
[assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")]
|
||||||
|
[assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
|
||||||
|
|
||||||
//allow this to be mocked in our unit tests
|
//allow this to be mocked in our unit tests
|
||||||
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
|
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
|
||||||
@@ -326,7 +326,8 @@ namespace Umbraco.Core.Security
|
|||||||
|
|
||||||
//Special case to allow changing password without validating existing credentials
|
//Special case to allow changing password without validating existing credentials
|
||||||
//This is used during installation only
|
//This is used during installation only
|
||||||
if (AllowManuallyChangingPassword == false && ApplicationContext.Current.IsConfigured == false && oldPassword == "default")
|
if (AllowManuallyChangingPassword == false && ApplicationContext.Current != null
|
||||||
|
&& ApplicationContext.Current.IsConfigured == false && oldPassword == "default")
|
||||||
{
|
{
|
||||||
return PerformChangePassword(username, oldPassword, newPassword);
|
return PerformChangePassword(username, oldPassword, newPassword);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user