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 |
|
Sébastien Sougnez
|
ff8ea3ec6b
|
Link to template from "document types" or "content" screen (#2784)
|
2018-07-25 08:36:09 +02:00 |
|
Stephan
|
d7e97ac771
|
Remove unused CodeAnnotations attributes, obsolete stuff
|
2018-07-20 10:59:25 +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 |
|
Shannon
|
888f8cfc56
|
Merge branch 'temp8' into temp-editing-all-variants
# Conflicts:
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
# src/Umbraco.Web/Models/Mapping/MediaMapperProfile.cs
|
2018-07-19 19:30:38 +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
|
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 |
|
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 |
|
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 |
|
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
|
309e0e6dc8
|
Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants
|
2018-07-18 11:38:00 +10:00 |
|
Stephan
|
baead95c33
|
Comments and notes
|
2018-07-17 18:42:23 +02:00 |
|
Shannon
|
e2bcf59b0f
|
Fixes and documents the odd async usage for reading multipart in a model binder, fixes up navigation.service checks and adds unit tests for that
|
2018-07-17 15:33:57 +10:00 |
|
Shannon
|
e9752cd5e1
|
Gets all list views working correctly with content apps, fixes various issues, cleans up a bunch of code and reduces amount of service locator.
|
2018-07-17 14:23:07 +10: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 |
|
Shannon
|
c8e65f085b
|
Gets content apps working nicer so we can have a proper view model that is discoverable, updates list views to use the new way, removes strange hack of copying a list view from a tab that doesn't exist.
|
2018-07-16 22:32:46 +10: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 |
|
Shannon
|
9a2aa8fff0
|
Fixes up tests
|
2018-07-16 20:24:49 +10:00 |
|
Sebastiaan Janssen
|
565c9ef95d
|
Cleans up some code and fixes sorting / storing the correct order.
|
2018-07-16 11:41:10 +02:00 |
|
Sebastiaan Janssen
|
973a6471f3
|
Merge branch 'dev-v7-U4-9025-2' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-9025-2
|
2018-07-16 11:09:16 +02:00 |
|
Lee Kelleher
|
abf61417ad
|
U4-10561 - Performance improvement for IsAncestor/IsDescendant extension methods (#2768)
|
2018-07-16 10:44:54 +02:00 |
|
Shannon
|
d3ad0b8e03
|
Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants
|
2018-07-16 18:41:24 +10:00 |
|
Bjarne Fyrstenborg
|
ec78e99ca0
|
Add sortorder to prevalue
|
2018-07-15 22:07:06 +02:00 |
|
Bjarne Fyrstenborg
|
912b101d0a
|
Order items by sort order
|
2018-07-15 21:44:03 +02:00 |
|
Sebastiaan Janssen
|
1908725a9a
|
Merge pull request #2742 from nathanwoulfe/temp-U4-6946
U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
|
2018-07-13 11:12:16 +02:00 |
|
Shannon
|
072c1a6764
|
WIP - editing all variants at once, this is getting things wired up to display a content item, lots of TODOs added, models and mappings refactored, content apps put in c# model, etc...
|
2018-07-13 12:45:04 +10:00 |
|
Stephan
|
2051caaa01
|
Post-merge fixes
|
2018-07-12 18:05:48 +02:00 |
|
Shannon
|
7e77cd334d
|
fix merge
|
2018-07-12 22:57:29 +10:00 |
|
Shannon
|
a8ad55ef3c
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
# Conflicts:
# src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
# src/Umbraco.Web/UmbracoHelper.cs
|
2018-07-12 22:41:33 +10:00 |
|
Sebastiaan Janssen
|
b4a941e367
|
Merge pull request #2766 from Mundairson/dev-v7-U4-11509
Correct Umbraco.Web.UmbracoHelper and tests to coding standards
|
2018-07-12 13:17:47 +02:00 |
|
Sebastiaan Janssen
|
9e35748040
|
Merge pull request #2357 from Dexmoor/U4-10779
U4-10779 Allow Members tree to work independently of Member Types tree
|
2018-07-12 13:13:04 +02:00 |
|
Sebastiaan Janssen
|
c56dc63150
|
Merge pull request #2702 from nathanwoulfe/temp-U4-4732
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
|
2018-07-12 12:39:23 +02:00 |
|
Mundairson
|
583b25a85d
|
Correct Umbraco.Web.UmbracoHelper and tests to be coding standards compliant.
|
2018-07-11 17:24:36 +01:00 |
|
Sebastiaan Janssen
|
39b2e6543c
|
Merge pull request #2757 from Mundairson/temp8-U4-11492
U4-11492 Clean Umbraco.Web.UmbracoHelper [v8]
|
2018-07-11 15:14:27 +02:00 |
|
Shannon
|
92f85fad4a
|
Merging dictionary changes
|
2018-07-11 16:59:05 +10:00 |
|
Shannon
|
ebe224fb6e
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
|
2018-07-11 16:43:21 +10:00 |
|
Shannon
|
8521a405f7
|
manually merging other files
|
2018-07-11 16:43:09 +10:00 |
|
Shannon
|
13d6dfd234
|
renames DictionaryTreeController to have the correct file name
|
2018-07-11 16:42:25 +10:00 |
|
Shannon
|
7aa413d558
|
Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing)
# Conflicts:
# build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Constants-Applications.cs
# src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
# src/Umbraco.Core/Services/ConsentService.cs
# src/Umbraco.Core/Services/IRelationService.cs
# src/Umbraco.Core/Services/RelationService.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Services/ConsentServiceTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
# src/Umbraco.Web.UI.Client/src/less/application/grid.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/main.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
# src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
# src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.config
# src/Umbraco.Web.UI/config/trees.Release.config
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# 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/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/MacroController.cs
# src/Umbraco.Web/Editors/MemberController.cs
# src/Umbraco.Web/Models/RegisterModel.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/Trees/TreeControllerBase.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
|
2018-07-11 15:58:48 +10:00 |
|
Mundairson
|
85c9e66cee
|
Implemented changes from first PR code review.
|
2018-07-11 00:12:18 +01:00 |
|
Stephan
|
9ca298543f
|
Merge branch 'hackathon-automapper-update' of https://github.com/mzajkowski/Umbraco-CMS into temp8-2747
|
2018-07-10 09:37:54 +02:00 |
|
Stephan
|
ad633c7606
|
Merge branch 'temp8-2758' into temp8
|
2018-07-10 09:36:28 +02:00 |
|
Stephan
|
47cfe9c6c0
|
Merge branch 'temp8' into temp8-2758
|
2018-07-10 09:34:25 +02:00 |
|
Shannon Deminick
|
7132ccdd99
|
Merge pull request #2760 from umbraco/temp8-variants
Variants Refactoring [v8]
|
2018-07-10 13:05:13 +10:00 |
|
Shannon
|
7250b3d491
|
Fixes null checks on all parts of VariationContextAccessor.VariationContext.Culture and fixes translations with tokens for url collisions
|
2018-07-10 12:43:07 +10:00 |
|