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

7108 Commits

Author SHA1 Message Date
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
James Coxhead
dadc3ad7a7 Fixes #3348 - Configure Umbraco.Dropdown.Flexible for new installations 2018-10-21 19:18:43 +02:00
Anders Bjerner
f4a9617487 Improved the description for the "Icon" property 2018-10-21 12:50:42 +02:00
Carole Rennie Logan
7071b21db7 Updating example content app manifest 
Including roles
 2018-10-21 10:41:17 +02:00
Kenn Jacobsen
f993869482 Remove the default SMTP configuration 2018-10-19 15:16:01 +02:00
Stephan
2b83b44c9c Fix ContentService.GetPagedChildren 2018-10-18 14:25:35 +02:00
Robert
ace5c07987 Merge pull request #3152 from umbraco/temp8-w220 
Fixes: List view searching needs to search on variant names
 2018-10-18 08:51:32 +02:00
Stephan
15968bc99b Fix dates in document versions 2018-10-17 17:27:39 +02:00
Stephan
581658086f Fix KeyValueService for proper initialization 2018-10-17 15:11:00 +02:00
Stephan
e80ea9830c Fix bad LockDto primary key w/migration 2018-10-17 15:11:00 +02:00
Stephan
71cec84f78 Fix MigrationExpressionBase, minor typo 2018-10-17 15:11:00 +02:00
Stephan
d324466fe1 Fix LockDto, had wrong primary key + missing rows 2018-10-17 15:11:00 +02:00
Stephan
7c1c6f6806 Fix AlterTableBuilder, was ignoring primary keys 2018-10-17 13:57:35 +02:00
Shannon
69640515cf fixes issue with sorting on published 2018-10-17 13:44:24 +11:00
Shannon
d7b85397e7 Merge remote-tracking branch 'origin/temp8' into temp8-w220 2018-10-17 12:15:33 +11:00
Warren Buckley
d8f1ec5116 Merge pull request #3200 from umbraco/temp8-3087-tree-grouping 
#3087 - Tree Grouping in Settings section
 2018-10-16 10:14:22 +01:00
Stephan
f868172f48 Cleanup 2018-10-16 10:58:17 +02:00
Stephan
6e8411acaa Merge pull request #3287 from crgrieve/v8-content-app-roles 
v8 ContentApp Show/Hide per user Role
 2018-10-16 10:12:13 +02:00
Shannon
339417b977 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
 2018-10-16 13:11:09 +11:00
Stephan
7757c7060e Refactor ManifestContentAppDefinition for roles 2018-10-15 15:48:26 +02:00
Stephan
575d7a3ae7 Cleanup 2018-10-15 14:44:26 +02:00
Carole Rennie Logan
64d7caee78 Update src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs 
Rework logic on content app permissoins. Roles should override all other.
 2018-10-14 19:24:18 +01:00
Carole Rennie Logan
3a6f2545f6 Update src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs 
making it case insensitive
 2018-10-14 17:38:38 +01: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
00bad829c3 Removed rogue colon 2018-10-11 11:54:28 +02:00
Shannon
a534457f53 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 2018-10-11 10:15:07 +02:00
Robert
9231d2e61c Merge branch 'temp8' into temp8-w220 2018-10-11 09:42:27 +02: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
Sebastiaan Janssen
ee4a252b07 Revert "Fixed udi's rendered in rte content (#2531)" 
This reverts commit b0374695b1.
 2018-10-09 21:19:55 +02:00
Anders Bjerner
9b4f879b6d Added XML documentation to the DatabaseSchemaHelper class (#3205) 2018-10-09 12:28:43 +02:00
Warren Buckley
31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	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/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 09:25:00 +01:00
Robert
6275a481aa Fixed order by "updater" query. 2018-10-09 10:21:32 +02:00
Robert
4c6f297ce5 Merge branch 'temp8-w220' of https://github.com/umbraco/Umbraco-CMS into temp8-w220 2018-10-09 09:45:13 +02:00
Robert
cc52652481 Added some comments detailing the hack that is in place for the where clause. 2018-10-09 09:44:44 +02:00
Robert
b2d1a48c7a Added null check for EmailValidator value, fixed js error. 2018-10-09 08:19:36 +02:00
Stephan
00017a0624 Version 8.0.0-alpha.52 for ModelsBuilder 2018-10-08 16:46:23 +02:00
Stephan
0f7f6aad41 Add migration to drop task tables 2018-10-08 16:16:47 +02:00
Kenn Jacobsen
2e135d2006 Register an audit on the parent node when sorting child nodes. 2018-10-08 15:11:51 +02:00
Warren Buckley
7db13960e9 Adds in GetAllTypes to ApplicationTreeService 2018-10-08 13:32:12 +01:00
Shannon
210102fcdc oops incorrect package version got reverted 2018-10-08 13:10:38 +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
Shannon
1bb4d3d3ec Merge remote-tracking branch 'origin/temp8' into temp8-w220 2018-10-08 10:10:56 +02:00
elitsa
9ad65e5fa8 Deleting 'Task' related references and implementations 2018-10-08 10:08:04 +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
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