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

1292 Commits

Author SHA1 Message Date
James Coxhead
c3a3f4cf22 Create new relation type 2018-11-29 23:11:03 +00:00
James Coxhead
12d11b7c88 Render create view 
Load object types from API
 2018-11-29 22:07:17 +00:00
James Coxhead
738b42964d Added save action 2018-11-20 23:15:16 +00:00
James Coxhead
10f6f8df90 Show relations in edit view 2018-11-15 22:22:15 +00:00
James Coxhead
06d19f2735 Load relation type edit view 2018-10-28 19:04:00 +00:00
Stephan
c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Stephan
9320c1a061 Cleanup variants dirty tracking 2018-10-23 15:38:47 +02:00
Shannon
ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Shannon
001ed50c7d fixes test 2018-10-23 22:13:50 +11:00
Shannon
dfd3e8f4c4 Fixes tests and issue with member list view not passing the GUID along in the route 2018-10-23 22:10:27 +11:00
Shannon
fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Warren Buckley
2ec6216932 Merge pull request #3400 from umbraco/temp8-247-hostnames-dialog 
Temp8 247 hostnames dialog
 2018-10-23 11:28:08 +01:00
Stephan
9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
Shannon
69450791cf Fixes the new Id/Guid property on members, ensures all tabs are expanded by default and removes that init logic from JS since we don't want it there. 2018-10-23 19:25:48 +11:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Warren Buckley
2062672eda Camel case models for the hostnames dialog 2018-10-22 10:20:02 +01:00
Stephan
f46b7ca7b1 Rollback uses GetVersionsSlim 2018-10-22 08:45:30 +02:00
Shannon
c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.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/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00
Ed Parry
201a2cd7b1 Added the user ID and GUID to the user details view. (#3279) 2018-10-19 15:13:07 +02:00
fer22f
d95ec9eb14 Fix documentation of container styling of nodes 2018-10-19 14:56:52 +02:00
Søren Kottal
1b0581bfce xml comments for ImageCropMode 2018-10-19 11:26:33 +02:00
Shannon
abeb4e04e5 Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests. 2018-10-19 15:41:28 +11:00
Shannon
cc4ee6527d Gets the correct variant logging put in to the audit trail, cleans up audit trail messages to make sense, makes sure audit trail is reloaded when changing variants 2018-10-19 13:24:36 +11:00
Warren Buckley
27ce1f34bb Make the JSON model over the API control be the correct casing & make Mads happy :) 2018-10-17 13:24:23 +01:00
Warren Buckley
c05495f358 WIP: Adds a new API endpoint in the editor/webapi for ContenController to list rollback versions available for a culture 2018-10-17 12:15:57 +01:00
Shannon
ba186144a0 Updates models to allow dirty tracking on variants 2018-10-17 18:09:52 +11:00
Shannon
a100d321f6 Fixes group node route 2018-10-16 18:08:57 +11:00
Shannon
10873c1dfc Cleans up all old tree classes. woohoo! 2018-10-16 17:41:02 +11:00
Shannon
286f7b3279 Gets tree syncing working, updates the GetApplicationTrees to still return a single Root since we require this everywhere for JS, fixes full screen section and makes users a full screen section (and reduces unecessary code), removes code to avoid breaking changes from v7 2018-10-16 16:41:06 +11:00
Stephan
ee24fb4ef7 Make Tests Green Again 2018-10-09 23:02:22 +02:00
elitsa
85309e8ce5 Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089 2018-10-08 10:23:53 +02:00
elitsa
e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
Shannon
b48202197f Merge remote-tracking branch 'origin/temp8' into temp8-I3089 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
 2018-10-08 09:54:12 +02:00
elitsa
0cc5a01069 packages section is there with translations sections and correct trees 2018-10-05 11:09:33 +02:00
Stephan
96acc1bd7e Contextualize variations in fallback, too 2018-10-03 16:19:41 +02:00
Stephan
2020c680d6 Merge branch temp8 into temp8-11502 2018-10-03 15:08:12 +02:00
Shannon
651b4a348a gets unpublish working 2018-10-03 14:27:48 +02:00
Stephan
e44ed00c97 Another fallback iteration 2018-10-03 10:31:35 +02:00
Shannon
edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02:00
Stephan
8a29745b98 Merge branch temp8 into temp8-11502 2018-10-01 14:45:33 +02:00
Matthew-Wise
a33ccd15c6 Convertion of assigndomain2.aspx to angular (#2897) 2018-09-30 16:02:09 +02:00
Robert
442e0c93a5 Merge branch 'temp8' into temp8-p181 2018-09-27 15:17:56 +02:00
Shannon
83501ba1eb Gets tree node states showing correctly for variants. 2018-09-27 19:30:31 +10:00
Sebastiaan Janssen
85291b562e Merge pull request #2533 from ronaldbarendse/U4-10586 
Added property editor alias to PreValueDisplayResolver warning
 2018-09-26 23:03:57 +02:00
Stephan
ad8c309f3d Variant-contextual breadcrumb 2018-09-26 16:27:34 +02:00
Stephan
14bd8a0851 Cleanup some DTOs 2018-09-25 18:05:14 +02:00
Stephan
d6775aa79a Implement content apps code config and manifest 2018-09-21 08:09:53 +02:00
Shannon
82b2778a59 Merge branch 'temp8' into temp8-p188 2018-09-19 16:16:03 +10:00
Stephan
95361da1f8 Cleanup/fix content variants mapping 2018-09-17 13:19:29 +02:00
Mads Rasmussen
daa8b90372 Merge pull request #2982 from umbraco/temp8-get-preview-working 
v8 - Gets previewing working with variants
 2018-09-14 13:41:18 +02:00