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

23998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
6ffcea8aae Gets the content loading into split view 2018-07-13 17:27:34 +10:00
Shannon
0e41c2dfcd Cutures can now be changed and the editor updated to the variant specific values without reloading, split view is re-enabled so working on getting that showing now. 2018-07-13 15:53:59 +10: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
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
Shannon
41407d27d0 hopefully the last merge 2018-07-12 22:39:30 +10:00
Shannon
7cec861323 more manual merges 2018-07-12 22:18:03 +10: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
2607e5b5a1 ContentVariation is not a Flag enum 2018-07-10 11:01:52 +02: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
37871f4de5 updated package-lock 2018-07-10 13:19:13 +10: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
Stephan
02de09eaf7 Explain last merge 2018-07-09 18:26:15 +02:00
Stephan
7c43fbd0c6 Merge pull request #2761 from mzajkowski/hackathon-publishing 
Removed bulk publishing action from the content tree (temp) [v8hackaton]
 2018-07-09 18:24:43 +02:00
Stephan
6f139cd72a Misc cleanup of PR 2018-07-09 18:08:03 +02:00
Stephan
97d4d48c4d Merge branch 'v8hack-delete-obselete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2758 2018-07-09 17:35:41 +02:00
Stephan
e644b63ba6 Misc cleanup of PR 2018-07-09 17:29:50 +02:00
Stephan
52be2d7864 Merge branch 'v8hackathon-library-media-remove' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp-2748 2018-07-09 16:34:44 +02:00
Stephan
1f37fb2c67 Merge branch 'v8hackathon-library-delete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2746 2018-07-09 13:02:25 +02:00
Stephan
00bcef3ba6 Misc cleanup of PR 2018-07-09 12:40:57 +02:00
Stephan
f4983a2b21 Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops 2018-07-09 11:49:56 +02:00
Stephan
ec9d4dc565 Merge pull request #2714 from umbraco/temp-w77 
Fixes models builder false positive error on media and member type mo…
 2018-07-09 10:42:32 +02:00
Warren Buckley
2bae3e2eda Merge pull request #2759 from umbraco/temp8-82 
fixes: Infinite editing support for content picker
 2018-07-06 14:43:07 +01:00
Mads Rasmussen
3caafc03f1 Merge branch 'temp8' into temp8-82 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2018-07-06 15:41:08 +02:00
Stephan
6bcf1e4cd8 Merge branch temp8 into temp8-variants 2018-07-06 12:29:18 +02:00
Stephan
ef28f23c61 Renormalize 2018-07-06 12:27:39 +02:00
Stephan
860def507b Fix .editorconfig line endings 2018-07-06 12:26:14 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
e9a31437e1 Fix .editorconfig line endings 2018-07-06 12:20:05 +02:00
Mads Rasmussen
b63af8b56f convert the last pickers in the user section to infinite editors 2018-07-05 20:22:27 +02:00
Stephan
75d685ef43 NuCache - fix parent published 2018-07-05 17:08:40 +02:00
Stephan
0af18b2376 Fix publishing 2018-07-05 17:07:40 +02:00
Mads Rasmussen
10207a1c50 remove unused overlay 2018-07-05 10:59:33 +02:00
Marcin Zajkowski
8f7bc1a083 Merge remote-tracking branch 'origin/temp8' into hackathon-publishing 2018-07-04 22:16:02 +02:00
Mads Rasmussen
a9fd88567e update treePickers on user group to use infinite editing 2018-07-04 20:19:54 +02:00
Mads Rasmussen
cabc3b7567 fix up infinite trees in insert overlay and change insert overlay to infinite editing 2018-07-04 19:47:06 +02:00
Mads Rasmussen
579dc058aa ues infinite tree picker in prevalue editors 2018-07-04 14:28:37 +02:00
Warren Buckley
a57658b274 Merge pull request #2737 from umbraco/temp8-w80 
Fixes - Create user confirmation page gives angulajs error
 2018-07-04 13:24:52 +01:00
Mads Rasmussen
8dbc4cb2c5 use infinite tree picker in member picker property editor 2018-07-04 13:46:09 +02:00
Mads Rasmussen
e74112ee2a use infinite tree picker in related links property editor 2018-07-04 13:44:20 +02:00
Mads Rasmussen
be9db43e21 use infinite tree for partial view picker 2018-07-04 13:17:37 +02:00