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
Sébastien Sougnez
ff8ea3ec6b
Link to template from "document types" or "content" screen ( #2784 )
2018-07-25 08:36:09 +02:00
Kenn Jacobsen
c85185bdb0
Visual improvements to Nested Content (U4-10742) ( #2457 )
2018-07-24 16:19:26 +02:00
agrath
43fd34ab80
U4-11152 Add visual indicator to trashed media items in the media pic… ( #2542 )
2018-07-24 16:10:30 +02:00
Sebastiaan Janssen
794c7fc389
Merge pull request #2790 from agrath/U4-11531
...
U4-11531 When the grid editor initializes it can set the form state to dirty
2018-07-24 09:25:52 +02:00
Sebastiaan Janssen
e0b1507056
Show/hide label field when label is toggled
...
Adds dib class to parent div to make the click target smaller
2018-07-23 23:22:52 +02:00
Stephan
c7fabf84ba
Merge branch origin/temp8 into temp8
2018-07-20 11:01:10 +02:00
Stephan
d7e97ac771
Remove unused CodeAnnotations attributes, obsolete stuff
2018-07-20 10:59:25 +02:00
Stephan
ef7be48cc5
Fix SqlTemplates concurrency
2018-07-20 10:41:22 +02:00
Gareth Evans
88b6f4e436
Guard gridController.addRow from setting form state to dirty if invoked from initSection
2018-07-20 11:42:52 +12:00
Shannon
5fdaa451b8
fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value
2018-07-19 22:35:05 +10:00
Stephan
d36ec60039
Fix IPropertyValueConverter determining HasValue
2018-07-19 11:02:51 +02:00
Sebastiaan Janssen
b9d7046bbc
Merge pull request #2788 from nathanwoulfe/temp-U4-6946
...
Updating #2742 - U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
2018-07-19 10:28:24 +02:00
Sebastiaan Janssen
09dd5cf879
Merge pull request #2781 from Mundairson/temp8-U4-11428
...
U4-11428 CodeAnnotations classes have inconsistent constructor parameter order
2018-07-19 09:18:17 +02:00
Nathan Woulfe
06f014df61
remove TryGetViewPath as not needed
2018-07-19 08:28:07 +10: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
Mundairson
d7d36c34be
Removed empty block comments.
2018-07-18 14:29:10 +01:00
Sebastiaan Janssen
6f6c29ce43
Merge pull request #2782 from agrath/u4-11522
...
U4-11522 Add ~/.well-known to umbracoReservedUrls
2018-07-18 15:14:54 +02:00
Sebastiaan Janssen
26a004210e
Merge pull request #2787 from leekelleher/U4-10561-1
...
U4-10561 - Bug fix for IsAncestor/IsDescendant extension methods
2018-07-18 14:50:06 +02:00
Sebastiaan Janssen
d9459661eb
Merge pull request #2785 from nathanwoulfe/temp-U4-11524
...
U4 11524 - icon alignment in help drawer
2018-07-18 14:49:31 +02:00
leekelleher
2da5a522b0
Updated PublishedContent unit-test
...
to support the fix in commit 7a9a4a2fab
2018-07-18 10:56:31 +01:00
leekelleher
7a9a4a2fab
Fixes bug with comparing partial content paths
...
Raised here in a comment by @coolmikkel
https://github.com/umbraco/Umbraco-CMS/pull/2253#issuecomment-405751083
2018-07-18 10:54:19 +01:00
Stephan
6c526b24a0
Post-merge fixes
2018-07-18 10:32:50 +02:00
Shannon
1f1bb37a57
merges lang files
2018-07-18 16:08:38 +10:00
Shannon
959caf4d04
Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does
2018-07-18 15:42:12 +10: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
Nathan Woulfe
fe648c8069
get view content in service methods rather than controller
2018-07-18 14:27:18 +10:00
Nathan Woulfe
017b5353db
remove direct IO operation, replace with exisiting repository method
2018-07-18 14:02:26 +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
Shannon Deminick
438261beb8
Merge pull request #2780 from umbraco/temp8-w49
...
Allow IPropertyValueConverter to determine if a property has value
2018-07-18 11:28:12 +10:00
Nathan Woulfe
9488df823a
remove inline styles in help drawer
2018-07-18 11:00:27 +10:00
Nathan Woulfe
1294512ce8
fix cropped icon, resize large to double small icon size
2018-07-18 10:06:08 +10:00
Stephan
c7c1c7e8fa
Cleanup ISqlSyntaxProvider
2018-07-17 17:20:40 +02:00
Stephan
132b729dd9
Fix nuspec for AutoMapper
2018-07-17 15:51:39 +02:00
Gareth Evans
ef897b2d3e
Add ~/.well-known to umbracoReservedUrls to support letsencrypt/certifytheweb ootb
2018-07-17 12:25:57 +12:00
Mundairson
9e21a72515
Changed the constructors so the two overloads have the same parameter in the same position.
2018-07-16 22:12:03 +01:00
Mundairson
e17d2fbfc0
Changed the constructors so the two overloads have the same parameter in the same position.
2018-07-16 22:09:03 +01:00
Mundairson
9b5455c186
Changed the constructors so the two overloads have the same parameter in the same position.
2018-07-16 22:06:45 +01:00
Stephan
05317bb5e6
Allow IPropertyValueConverter to determine if a property has value
2018-07-16 19:14:00 +02:00
Sebastiaan Janssen
157b66dc4c
Fixes the persistence and correct display of the sort order
2018-07-16 18:08:20 +02:00
Stephan
874ec142bf
Variations with Compositions
2018-07-16 17:21:26 +02:00
Sebastiaan Janssen
596157f90b
Default to section route if not specified
2018-07-16 16:00:05 +02:00
Sebastiaan Janssen
2a080da666
Merge pull request #2603 from mvanhelmont/patch-2
...
U4-11275 routPath in custom tree always needs a id
2018-07-16 15:56:38 +02:00
Sebastiaan Janssen
014e50a13a
Merge pull request #2148 from LennardF1989/U4-10345
...
Added possibilty to ignore collisions from an IContentFinder (U4-10345)
2018-07-16 13:38:23 +02:00
Sebastiaan Janssen
9fc3dfdbee
Merge pull request #2771 from hartviglarsen/temp-U4-11516
...
U4-11516 Updates the links in the noNodes splash screen
2018-07-16 12:03:07 +02:00
Sebastiaan Janssen
565c9ef95d
Cleans up some code and fixes sorting / storing the correct order.
2018-07-16 11:41:10 +02:00
