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

1530 Commits

Author SHA1 Message Date
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
James Coxhead
9a774c8f9e Added inactive state for users who haven't logged in 2018-08-02 22:01:45 +01:00
Stephan
0928fc099d Merge branch temp8 into temp8-11502 2018-07-31 15:34:42 +02: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
Sebastiaan Janssen
86acf0c1ad Revert "enable use of radiobuttonlist pre editor" 
This reverts commit 80412f56ee.
 2018-07-30 15:46:34 +02:00
AndyButland
c61f041d06 Added fallback by language option to IPublishedElement and IPublishedProperty 2018-07-28 08:39:12 +02:00
AndyButland
85bdc8f14d Updated XML documentation on IPublisedValueCallback methods 2018-07-28 07:56:23 +02:00
Anthony
8e78c3dfb1 Refactored out some obsolete methods and files. 2018-07-27 15:51:32 +01:00
Richard Thompson
60910efc53 U4-10681 Restore option in media recycle bin (#2342) 2018-07-27 15:56:18 +02:00
Stephan
2b3807ffee Merge branch temp8 into temp8-11502 2018-07-26 09:58:17 +02:00
Jan Skovgaard
9180ab4442 Reset commit to not break backwards compatibility mode 2018-07-25 11:08:33 +02:00
Jan Skovgaard
4e1e9e0687 Switch JSON to be the default storage option and changing the storage type text to say JSON is default and CSV is legacy 2018-07-25 11:08:32 +02:00
skidmow
c264368042 U4-11528 Problem with length of culture in database (#2791) 2018-07-25 10:06:29 +02:00
Stephan
a35f67ecef Refactoring 2018-07-24 15:04:30 +02:00
Stephan
053698baf6 Merge branch andyb/u4-11502 into temp8-11502 2018-07-23 15:12:52 +02:00
AndyButland
1be74589f2 Combined fallback parameters into an array that defines methods and priority to be used. 2018-07-21 15:58:49 +02:00
AndyButland
695f21eadb Removed unnecessary loop in looking up value from a fall-back language. 
Put in a check to abort fall-back if there's a loop in language fall-backs.
 2018-07-21 09:41:07 +02: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
Sebastiaan Janssen
f622a9154b Merge pull request #2763 from OptimisticCoder/U4-7030-Using-radiobuttonlist-prevalue-editor 
U4-7030 enable use of radiobuttonlist pre editor
 2018-07-18 15:29:20 +02:00
Stephan
b1ef9c5aa8 U4-11502 misc fixes 2018-07-18 12:27:14 +02:00
Stephan
b5dc538905 Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502 2018-07-18 11:13:22 +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
AndyButland
91a0ee2c93 Refactored to object graph reference of fallback language to just use id 2018-07-12 20:52:02 +01: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
AndyButland
aadd843c33 Implemented published value fall back via language 2018-07-08 16:14:58 +02:00
AndyButland
592de8bebc Model, retrieval, mapping and display for fall back language editing 2018-07-08 16:14:47 +02:00
Dan Patching
80412f56ee enable use of radiobuttonlist pre editor 2018-07-08 14:15:27 +01: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