yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,725 Commits 4 Branches 7 Tags
8b4e2c5bcb1fe426cfdff081673ad45a658852fc
Commit Graph

1461 Commits

Author SHA1 Message Date
Stephan
eaacdc0514 Deal with fixmes in IContent IsCultureSomething 2018-08-28 15:11:13 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Warren
fb4b0ceb69 Verified the log works correctly from my TODO note 2018-08-23 13:23:40 +01:00
Warren
9e996c68bb Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too 2018-08-17 15:41:58 +01:00
Warren
f9ba6970f4 Last pass of updating log messages in the solution 2018-08-16 12:42:21 +01:00
Warren
47c8651609 Update more logging messages to use templates as opposed to string formats that were using the LoggerExtensions <T> 2018-08-16 12:00:12 +01:00
Shannon
2a15feec40 Fixes state issue to ensure that non-created variants show up as not-created 2018-08-15 15:13:27 +10:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Shannon
e53fe669ef Start to setting files with a culture and catering for being able to set any metadata for files 2018-08-07 00:43:52 +10:00
Shannon
7aaf024397 more work on validation, saving and publishing 2018-08-06 16:50:40 +10:00
Shannon
9241e1fcda WIP Getting the content controller a bit further, now need to pull apart the content binder 2018-07-31 17:50:24 +10:00
Shannon
122c18e6d7 Merge branch 'temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-07-31 15:56:04 +10:00
Shannon
d073e727cb minor merge fixes 2018-07-31 15:11:31 +10:00
Shannon
f4342ed9cb Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI/web.Template.Debug.config
 2018-07-31 12:34:03 +10:00
Shannon
8517a8e088 fixes tests 2018-07-31 12:19:12 +10:00
Anthony
8e78c3dfb1 Refactored out some obsolete methods and files. 2018-07-27 15:51:32 +01:00
Shannon
18cd9ea1e8 WIP refactor commit for getting all variants at once saving, this requires pulling apart a lot of the models and corresponding binders and validators. 2018-07-19 19:32:07 +10:00
Stephan
d36ec60039 Fix IPropertyValueConverter determining HasValue 2018-07-19 11:02:51 +02:00
Stephan
6c526b24a0 Post-merge fixes 2018-07-18 10:32:50 +02:00
Shannon
ec1d013004 Manually merges the IgnorePublishedContentCollisions change, removes more service locator pattern, removes ContextMapper with UmbracoContext and instead uses IUmbracoContextAccessor and adjusts some DI. 2018-07-18 14:34:32 +10:00
Shannon
66f9eb01c7 merge fixing and cleanup 2018-07-18 13:19:48 +10:00
Shannon
390514cd9d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/routes.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/config/splashes/noNodes.aspx
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2018-07-18 13:19:14 +10:00
Shannon Deminick
cf6a8956cd Merge pull request #2779 from umbraco/temp8-w112 
Variations with Compositions
 2018-07-18 11:32:59 +10:00
Stephan
05317bb5e6 Allow IPropertyValueConverter to determine if a property has value 2018-07-16 19:14:00 +02:00
Stephan
874ec142bf Variations with Compositions 2018-07-16 17:21:26 +02:00
Sebastiaan Janssen
c0f102f1e0 Merge branch 'pr_2463' into dev-v7 2018-07-14 18:47:42 +02:00
Stephan
2607e5b5a1 ContentVariation is not a Flag enum 2018-07-10 11:01:52 +02:00
Stephan
ad633c7606 Merge branch 'temp8-2758' into temp8 2018-07-10 09:36:28 +02:00
Stephan
6f139cd72a Misc cleanup of PR 2018-07-09 18:08:03 +02:00
Stephan
0d3ea107c5 Deal with some FIXME 2018-07-04 10:41:08 +02:00
Stephan
b3696c29cc Refactor Variants at service level 2018-07-04 08:59:50 +02:00
Stephan
ecf9a928d7 Refactor variations 2018-07-03 13:05:21 +02:00
Anthony
43fdd691fe Removed obsolete methods from Umbraco.Core which are not used 2018-07-01 18:58:58 +01:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Shannon
504b6cb079 Changes Content.Names to Content.CultureNames and Content.PublishNames to Content.PublishCultureNames 2018-06-01 16:15:46 +10:00
Shannon
b75cf3bc76 Changes EnumExtensions to ContentVariationExtensions and adds more helper methods to replace a lot of the duplicate checking in our code. Adds code to enforce unique naming for culture names, adds supporting tests. 2018-06-01 15:20:16 +10:00
Shannon Deminick
6c0c59f731 Merge pull request #2660 from umbraco/temp8-user-unknown 
Ensures referential integrity for all FKs to umbracoUser but supports NULL entries
 2018-06-01 11:53:14 +10:00
Shannon
abbb119fc9 Ensures ref integrity for all FKs to umbracoUser table but support NULL values 2018-05-31 23:05:35 +10:00
Stephan
3862ff9076 Cleanup and get rid of other warnings 2018-05-31 11:55:37 +02:00
Shannon
3da120ce33 Adds Property Type to the published content model, fixes some web.config versions 2018-05-17 13:32:20 +02:00
Shannon
07a263b794 Fixes validation check for variant nodes that don't have names assigned 2018-05-17 10:28:38 +02:00
Shannon
f2b78c06ef FIxes issue where an invariant property type was being validated with a culture when that would always fail. Fixes issue when saving a content type to ensure that a property type is never both variant and invariant. Adds test. 2018-05-10 18:01:41 +10:00
Stephan
b1faade9b0 Revert various changes 2018-05-08 16:41:30 +02:00
Stephan
6051891280 Fixes 2018-05-08 11:06:07 +02:00
Shannon
389fb100bb 'fixes' an issue where you can get any property value back due to the incorrect cache key being used 2018-05-08 16:01:20 +10:00
Shannon
ee9f150483 Removes the AdditionalData properties for EntitySlim and moves them to real properties of IDocumentEntitySlim, renames PublishedCultureInfos to not be plural 2018-05-08 12:43:07 +10:00
Shannon
85c739aed4 Merge branch 'temp8-U4-11227' into temp8-U4-11282 
# Conflicts:
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
 2018-05-08 12:31:03 +10:00
Stephan
3f73452bc7 Various fixes, and U4-11287 2018-05-07 18:51:18 +02:00
Stephan
5247a9d143 Merge branch temp8 into temp8-U4-11227 2018-05-07 18:27:30 +02:00
Shannon
b1eeb5b193 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282 2018-05-08 00:39:12 +10:00