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

1548 Commits

Author SHA1 Message Date
Shannon
f223024164 Got database and persistence models in place for scheduled publishing, now need to start writing tests, fixing tests and cleaning up fixme statements 2018-11-02 14:55:34 +11:00
Stephan
45cb56b96c Fix ContentCultureInfos and collection 2018-10-26 12:36:59 +02:00
Shannon
3d29c0381e small refactor of trees for single page apps sections and some cleanup, puts the back button for dictionary back in with the correct route 2018-10-26 14:18:42 +11:00
Stephan
a8110a0886 Merge branch temp8 into temp8-3129 2018-10-25 10:32:05 +02:00
Stephan
638f8b57b3 Fix content type variant changes 2018-10-24 18:47:17 +02: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
93a52432cf Manual merging 2018-10-22 17:04:58 +11: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
Anders Bjerner
f4a9617487 Improved the description for the "Icon" property 2018-10-21 12:50:42 +02:00
Shannon
239112a1de notes 2018-10-19 15:45:05 +11: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
Shannon
71fd47f452 Fixes issue of observable collections, event binding and deep cloning 2018-10-19 08:45:53 +11:00
Shannon
b30f55ea30 Fixes issue of observable collections, event binding and deep cloning 2018-10-19 08:26:17 +11:00
Shannon
c3e2d2a821 Cleaning up the log/audit trail usage, removing duplicate and unecessary entries and adding new cols 2018-10-18 22:52:49 +11:00
Shannon
a163f79526 Merge remote-tracking branch 'origin/temp8' into temp8-dirty-tracking-on-variants 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/Content.cs
 2018-10-18 22:52:15 +11:00
Shannon
f1ca32ea54 Cleaning up the log/audit trail usage, removing duplicate and unecessary entries and adding new cols 2018-10-18 22:47:12 +11:00
Shannon
6cd9102fac Gets publish names tracking changes, adds unit tests 2018-10-18 21:12:55 +11:00
Stephan
15968bc99b Fix dates in document versions 2018-10-17 17:27:39 +02:00
Shannon
ba186144a0 Updates models to allow dirty tracking on variants 2018-10-17 18:09:52 +11:00
Stephan
f868172f48 Cleanup 2018-10-16 10:58:17 +02:00
Carole Rennie Logan
1f072a383e ContentApp Show/Hide per user Role 
Making content app work show hide in manifest work for user roles. for example:

 "show": [
                "+role/admin"
            ]
 2018-10-14 15:56:22 +01:00
Robert
a8449a4d01 Merge pull request #3155 from umbraco/temp8-222-variant-invariant-data-updates 
variant to invariant data updates
 2018-10-10 08:44:33 +02:00
Robert
d41251819f RemoveItem now returns a bool 2018-10-10 08:27:20 +02:00
Robert
931fcd565a Removed the override of IsPropertyDirty as is not needed. 2018-10-10 08:26:10 +02: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
4bde59ed66 Translation clean up 2018-10-08 10:13:36 +02:00
elitsa
e2acc8b447 Remove sections icons - not needed anymore 2018-10-08 10:00:52 +02:00
Shannon
fdc94b9d1b Writes tests to ensure that property values are updated in docs that are of a composed type of the one that variants are being changed in. 2018-10-05 15:07:19 +02:00
Shannon
9222ede853 Merge remote-tracking branch 'origin/temp8' into temp8-222-variant-invariant-data-updates 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
 2018-10-04 16:39:23 +02:00
Stephan
9106dc9ca9 Fix ModelType and media picker converter for when picking only images 2018-10-04 16:16:56 +02:00
Shannon
7b41730b60 Changes how variant property data is updated with bulk SQL and gets tests working 2018-10-04 14:15:54 +02:00
Shannon
26759e97fa First iteration to populate property type changes when they are changed variant/invariant 2018-10-03 19:03:22 +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
39458017ec removes old tag API 2018-10-02 15:29:17 +02:00
Stephan
8a29745b98 Merge branch temp8 into temp8-11502 2018-10-01 14:45:33 +02:00
Asbjørn
7f107a8559 Make TagSupport and related types public #2988 2018-09-29 17:42:45 +02:00
Stephan
621ef28680 Fix PublishedElementModel, must be abstract 2018-09-28 16:59:00 +02:00
Stephan
14bd8a0851 Cleanup some DTOs 2018-09-25 18:05:14 +02:00
Stephan
c791050058 Denormalize variants for perfs 2018-09-25 16:55:00 +02:00
Stephan
f4e87b9949 Merge branch temp8 into temp8-IDocumentEntity-updates 2018-09-24 19:12:56 +02:00
Stephan
681ef67653 Support ordering content apps 2018-09-21 09:42:36 +02:00
Stephan
d6775aa79a Implement content apps code config and manifest 2018-09-21 08:09:53 +02:00
Shannon
539c882adb Merge branch 'temp8' into temp8-IDocumentEntity-updates 2018-09-21 01:06:21 +10:00
Shannon
feeb1c56cf wip for IDocumentEntitySlim changes 2018-09-20 14:58:15 +10:00