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

3255 Commits

Author SHA1 Message Date
Sebastiaan Jansssen
849cd4d315 Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9 2018-02-23 13:49:57 +01:00
Sebastiaan Jansssen
10141bf4f6 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
 2018-02-23 13:49:20 +01:00
Sebastiaan Jansssen
92c0cfb9df Additional action needs to be counted in the test 2018-02-23 10:58:33 +01:00
Shannon
1788682af9 U4-10915 Umbraco automapper configuration is not valid 2018-02-20 19:16:53 +11:00
Stephan
47d7677948 Refactor editing, all tests green 2018-02-16 12:00:45 +01:00
Sebastiaan Jansssen
a5caf361e0 Update DateTime.Now usages to be UtcNow to be independent of local datetime 2018-02-15 15:55:40 +01:00
Sebastiaan Jansssen
74c3aaade5 Merge branch 'dev-v7.9' into temp-u4-10795 2018-02-15 15:50:15 +01:00
Stephan
cfd2ba3b5a Refactor editing 2018-02-15 14:53:29 +01:00
Stephan
d30842e1bf Cleanup editing 2018-02-14 16:55:42 +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
Shannon
b42f75df17 fixes tests 2018-02-13 19:29:19 +11:00
Shannon
3cdd8a0c43 removes methods from the interface we don't want to support 2018-02-12 20:48:42 +11:00
Shannon
eabc009f0c Adds validation to IAuditService.Write 2018-02-12 17:37:52 +11:00
Sebastiaan Jansssen
095633ba27 Test names were inverted 2018-02-09 13:27:25 +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
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
Stephan
c0439b3c4e DataTypes refactoring - troubleshooting 2018-02-08 16:08:52 +01:00
Stephan
7c34255abe Merge branch origin/dev-v7.9 into temp-u4-10795 2018-02-07 15:55:41 +01:00
Stephan
450854a209 DataType refactoring - polish 2018-02-07 13:35:59 +01:00
Stephan
02397fd90c U4-10795 - granular logging 2018-02-06 19:07:54 +01:00
Stephan
a97900515b DataType refactoring - polish 2018-02-05 17:48:54 +01:00
Stephan
947d08c947 DataType refactoring - troubleshooting 2018-02-02 19:50:48 +01:00
Stephan
c748a2bc41 DataType refactoring - all tests green 2018-02-01 17:53:32 +01:00
Stephan
b416079e12 DataType refactoring - troubleshooting tags and fixing tests 2018-02-01 14:14:45 +01:00
Sebastiaan Jansssen
647492fbfb Merge branch 'dev-v7.9' into temp-u4-10794 2018-02-01 12:55:53 +01:00
Stephan
971d7cf933 U4-10794 - refactor 2018-01-31 15:20:03 +01:00
Stephan
f5546ca870 DataType refactoring - troubleshooting and fixing tests 2018-01-29 19:23:25 +01:00
Stephan
e1208e5019 U4-10794 - use string ids, not udis 2018-01-29 11:30:01 +01:00
Shannon
995f644501 Adds upgrade logic, fixes tests, fixes model mappings to not do so much AfterMap 2018-01-26 17:27:35 -07:00
Stephan
e60a5a4a83 DataType refactoring - in progress 2018-01-26 17:55:20 +01:00
Stephan
a16ac1f0ba U4-10794 - implement basic consent service 2018-01-26 10:57:12 +01:00
Stephan
f7f42f893b DataType refactoring - in progress 2018-01-24 13:37:14 +01:00
Stephan
c3e6886ac0 DataType refactoring - in progress 2018-01-24 11:44:44 +01:00
Shannon
b49db0e941 Initial commit for member type sensitive data, this adds the db and model requirements and updates the normal property editor for a member type which saves the isSensitive data to the db. 2018-01-23 13:01:31 -07:00
Shannon
e25f6e82ed Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2018-01-23 11:42:14 -07:00
Stephan
97a058b817 DataType refactoring 2018-01-20 12:31:42 +01:00
Stephan
e30d8f79ef DataType refactoring 2018-01-20 12:09:40 +01:00
Stephan
eff2e7a65b Manifest refactoring 2018-01-20 10:19:57 +01:00
James Jackson-South
24071eb3b1 Faster TryConvertTo 2018-01-20 14:54:52 +11:00
Sebastiaan Janssen
91469812d3 Merge pull request #2383 from MMasey/U4-10727 
U4 10727 - If nodes with an empty name exist, it's not possible to empty recycle bin
 2018-01-18 17:54:40 +01:00
Sebastiaan Janssen
a00c59e8b5 Merge pull request #2393 from umbraco/temp-u4-10079 
U4-10079 - remove default template
 2018-01-18 16:54:22 +01:00
Stephan
05c2da807f U4-10079 - fix test 2018-01-18 15:58:51 +01:00
Stephan
cc47276095 DataType refactoring preparation - Entity refactoring 2018-01-15 13:44:49 +01:00
Stephan
d23933a5b1 DataType refactoring preparation - Entity refactoring 2018-01-15 13:28:35 +01:00
Shannon
4a0cf81d7d fixes test 2018-01-15 18:19:23 +11:00
Shannon
fef743517f Allows for passing in an Unknown object type to the IEntityService.GetIdForKey and GetKeyForId methods 2018-01-15 18:05:52 +11:00
Shannon
b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-15 16:27:29 +11:00
Sebastiaan Janssen
355fb64d8b Merge pull request #1573 from drbldgtl/dev-v7-U4-6415 
Renamed SerializeToCropDataSet to DeserializeToCropDataSet
 2018-01-13 17:33:44 +01:00