yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,275 Commits 4 Branches 7 Tags
80db20fdfb1575b5665b82fa108ceae4cd11ea0d
Commit Graph

6579 Commits

Author SHA1 Message Date
agrath
43fd34ab80 U4-11152 Add visual indicator to trashed media items in the media pic… (#2542) 2018-07-24 16:10:30 +02:00
Sebastiaan Janssen
e0b1507056 Show/hide label field when label is toggled 
Adds dib class to parent div to make the click target smaller
 2018-07-23 23:22:52 +02:00
Gareth Evans
88b6f4e436 Guard gridController.addRow from setting form state to dirty if invoked from initSection 2018-07-20 11:42:52 +12:00
Shannon
5fdaa451b8 fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value 2018-07-19 22:35:05 +10: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
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
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
Nathan Woulfe
9488df823a remove inline styles in help drawer 2018-07-18 11:00:27 +10:00
Nathan Woulfe
1294512ce8 fix cropped icon, resize large to double small icon size 2018-07-18 10:06:08 +10:00
Sebastiaan Janssen
157b66dc4c Fixes the persistence and correct display of the sort order 2018-07-16 18:08:20 +02:00
Sebastiaan Janssen
596157f90b Default to section route if not specified 2018-07-16 16:00:05 +02:00
Sebastiaan Janssen
2a080da666 Merge pull request #2603 from mvanhelmont/patch-2 
U4-11275 routPath in custom tree always needs a id
 2018-07-16 15:56:38 +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
Sebastiaan Janssen
a87987e5e9 Merge pull request #2772 from BatJan/features/temp-U4-11495 
U4-11495 - Add border to custom regex in property settings
 2018-07-16 11:06:22 +02:00
Bjarne Fyrstenborg
6ac654a36b Add different cursor styling on sortable thumbnail handle 2018-07-15 22:21:55 +02:00
Bjarne Fyrstenborg
130dabfdce Add monospace font on pre elements to ensure same width of elements 2018-07-15 20:23:54 +02:00
Bjarne Fyrstenborg
d697e46f24 Configurate sortable on color picker property editor 2018-07-15 20:22:12 +02:00
Bjarne Fyrstenborg
1296214400 Localization of text in color picker 2018-07-15 20:20:57 +02:00
Jan Skovgaard
e7932b6ae4 Replace the checkboxes with the umb-toggle directive using a toggleHandler in the controller 2018-07-15 18:00:20 +02:00
Jan Skovgaard
12dbb0ec20 Add a border and other adjustments specifically for the "validation" textarea when setting up a datatype on a document type 2018-07-15 12:26:35 +02:00
Sebastiaan Janssen
24e9136f57 Fixes U4-11517 - E-mail property editor triggers validation when validation has not been enabled in the settings 2018-07-15 08:36:37 +02:00
Sebastiaan Janssen
73b9374006 Merge branch 'U4-10975' of https://github.com/iofsauron/Umbraco-CMS into iofsauron-U4-10975 2018-07-14 18:57:43 +02:00
leekelleher
cf2938151f U4-11514 - Content Picker adds sortable options to restrict within container 2018-07-13 12:34:06 +01: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
7cec861323 more manual merges 2018-07-12 22:18:03 +10:00
Sebastiaan Janssen
374011ec9e Reverts some whitespace changes 2018-07-12 13:02:58 +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
Nathan Woulfe
f9761ad2f8 auto save on create to fetch existing view 2018-07-12 14:32:13 +10:00
Nathan Woulfe
f2fafbc631 handle manual/external links, add label to input, update placeholder 2018-07-12 11:37:04 +10:00
Sebastiaan Janssen
f966c38513 Merge pull request #2762 from nathanwoulfe/temp-U4-11107 
U4-11107 Link to the page is not active after saving content without publish
 2018-07-11 16:29:17 +02:00
Sebastiaan Janssen
f8b6b8c9ad Merge pull request #2722 from nathanwoulfe/temp-U4-11259 
U4-11259: Duplicates in tag editor throws error and breaks property editor
 2018-07-11 16:11:31 +02:00
Nathan Woulfe
914a8fdc2b revert link change, config test now passes 2018-07-11 16:27:53 +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
Nathan Woulfe
f416fc6919 clear preview cookie when clicking the info-box link 2018-07-11 15:25:39 +10: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
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
Dan Patching
80412f56ee enable use of radiobuttonlist pre editor 2018-07-08 14:15:27 +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
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Nathan Woulfe
d3c8b46e00 replace node.published with node.hasPublishedVersion 2018-07-06 09:52:43 +10:00
Mads Rasmussen
b63af8b56f convert the last pickers in the user section to infinite editors 2018-07-05 20:22:27 +02:00
Mads Rasmussen
10207a1c50 remove unused overlay 2018-07-05 10:59:33 +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