yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,507 Commits 4 Branches 7 Tags
74c3aaade51d9d3bc9c809c9f219e2d1ca34b89c
Commit Graph

18409 Commits

Author SHA1 Message Date
Sebastiaan Jansssen
74c3aaade5 Merge branch 'dev-v7.9' into temp-u4-10795 2018-02-15 15:50:15 +01:00
Stephan
cf94da2b8f refactor user and group logging 2018-02-15 14:01:04 +01:00
Sebastiaan Jansssen
826d6d5b15 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 2018-02-14 12:15:56 +01:00
Sebastiaan Jansssen
56f4904fc0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 2018-02-14 12:15:18 +01:00
Sebastiaan Jansssen
9178e7afcf Whoops, no need to introduce a new method here, old method was still available 2018-02-14 12:13:01 +01:00
Stephan
7f3733d4b5 cleanup 2018-02-14 11:27:43 +01:00
Sebastiaan Jansssen
3df23c3a34 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-14 10:34:26 +01:00
Sebastiaan Jansssen
7746c4a014 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
 2018-02-14 10:28:51 +01:00
Sebastiaan Jansssen
4640cf56d1 Make change non-breaking 2018-02-14 10:23:58 +01:00
Shannon
eae1ce7012 fixes build 2018-02-14 12:05:05 +11:00
Shannon
e900711180 Updates the CDF version changer to to use a hash of the current version and the date time so that it's not constantly updated if it's not changed. 2018-02-14 11:53:49 +11:00
Shannon
9f4875c8a7 removes SaveUserGroupWithUsersEventArgs and replaces with SaveEventArgs<UserGroupWithUsers> and changes the SavedUserGroupWithUsers to SavingUserGroup2 and SavedUserGroup2 2018-02-14 11:13:24 +11:00
Stephan
46902d4335 Merge branch 'temp-u4-10795' of https://github.com/umbraco/Umbraco-CMS into temp-u4-10795 2018-02-13 15:35:57 +01:00
Stephan
5eb22b0fd9 report added/removed users from groups 2018-02-13 15:30:58 +01:00
Stephan
6a18965946 Don't throw, DRY 2018-02-13 12:00:14 +01:00
Stephan
be1ec05072 Use constants for field lengths 2018-02-13 11:32:21 +01:00
Stephan
bb2caf85cb fix namespace 2018-02-13 09:47:23 +01:00
Shannon
8ee8bda953 fixes tests 2018-02-13 19:46:34 +11:00
Shannon
b42f75df17 fixes tests 2018-02-13 19:29:19 +11:00
Shannon
caa3a3319f Fixes issue with user groups being dirty and resetting dirty events 2018-02-13 18:54:13 +11:00
Shannon
5caf95331a Fixes PerformingUser for login/logout and actually logs the affected user 2018-02-13 18:29:39 +11:00
Shannon
c4fa3aa649 Fixes issue with AffectedUser vs PerformingUser, updates the log formatting and uses the affectedDetails better, fixes the double event calling for auth stuff, fixes the change password event raising, fixes reporting the changed property values for members 2018-02-13 00:15:04 +11:00
Mikulas Tomanka
d51cda7843 Merge pull request #2440 from ProNotion/patch-1 
Fixed typo on user section of tour
 2018-02-12 13:32:10 +01:00
Claus
372ffee42b Merge pull request #2437 from umbraco/temp-UAASSCRUM-1365 
allowing to disable the template check when sending content through t…
 2018-02-12 11:15:26 +01:00
Claus
c1cfea7ebd removing constructor. 2018-02-12 11:12:46 +01:00
Shannon
3cdd8a0c43 removes methods from the interface we don't want to support 2018-02-12 20:48:42 +11:00
Shannon
bf130584a6 updates docs 2018-02-12 18:28:51 +11:00
Shannon
c3e67705ba updated some naming conventions for eventType 2018-02-12 18:24:07 +11:00
Shannon
7a80d689aa Fixes invalid login attempts being logged against the admin user, updates the audit handler to log unique keys for the eventType 2018-02-12 18:12:16 +11:00
Shannon
eabc009f0c Adds validation to IAuditService.Write 2018-02-12 17:37:52 +11:00
ProNotion
d3a2d88347 Fixed type on user section 2018-02-09 17:33:11 +00:00
Claus
93f4d65227 Merge pull request #2438 from umbraco/temp-U4-10958 
Fixes broken MNTP by switching convert cases to the correct DataType
 2018-02-09 14:42:08 +01:00
Robert
a4c0342bda Fixes broken MNTP by switching convert cases to the correct DataType 2018-02-09 14:09:03 +01:00
Sebastiaan Janssen
6c328d729d Merge pull request #2435 from madsoulswe/temp-U4-10953 
U4-10953- Help-drawer, (caption + h3 -> h5
 2018-02-09 13:32:32 +01:00
Sebastiaan Jansssen
095633ba27 Test names were inverted 2018-02-09 13:27:25 +01:00
Claus
633d1bb0ae changing the template check to an enabled check instead. 2018-02-09 13:19:56 +01:00
Claus
fb89c3da3c allowing to disable the template check when sending content through to render. 2018-02-09 12:58:50 +01:00
Sebastiaan Jansssen
3097a46ab3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-09 09:57:00 +01:00
Sebastiaan Jansssen
c63156fcd8 Bump version to 7.7.11 
(cherry picked from commit 0c25c36af0)
 2018-02-09 09:53:52 +01:00
Stephan
29690df567 U4-10795 - misc fixes 2018-02-09 09:33:24 +01:00
Stephan
84a90884e3 Merge pull request #2433 from umbraco/temp-U4-10947 
Fix for not being able to save decimal value
 2018-02-09 08:14:51 +01:00
Shannon
d29b7311fa reverts the convertible2 back to what it was before 2018-02-09 10:08:25 +11:00
Shannon
17b59cc20f Updates the ObjectExtensions TryConvertTo code and moved all unit tests to ObjectExtensionsTests which now all pass 2018-02-09 10:02:51 +11:00
Robert
4423571eaa Added ConvertToNullableDecimalTest and check that fixes the decimal save issue 2018-02-08 16:21:09 +01:00
Dennis Öhman
750600b202 U4-10953 
Populate Caption in dashboardhelper
h2 -> h5
 2018-02-08 15:37:50 +01:00
Sebastiaan Jansssen
28eb4ff03a Bump version to 7.8.1 2018-02-08 14:08:38 +01:00
Robert
151c35bc47 Moving check to TryToConvertValueToCrlType 2018-02-08 13:15:43 +01:00
Robert
84265a9716 Fix checkbox in nested content 2018-02-08 12:18:51 +01:00
Robert
6618388973 Fix for not being able to save decimal value 2018-02-08 12:10:57 +01:00
Stephan
61ce533a08 U4-10795 - better performing user management, fix upgrades 2018-02-08 10:16:53 +01:00