Commit Graph

1704 Commits

Author SHA1 Message Date
Warren Buckley
244d441dd4 Remove the if security check if access to settings section - seems we do not need to do this
We check on the content node itself in the info tab for access to the doctype & template based on the section rather than the null presence of this property
2020-08-12 12:04:19 +01:00
Shannon
8ee9ac7e16 Merge remote-tracking branch 'origin/v8/feature/block-editor-list' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditors.directive.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
2020-06-26 10:48:42 +10:00
Niels Lyngsø
79e5ccb8d8 no message 2020-06-24 09:16:48 +02:00
Sebastiaan Janssen
fee6ef0fb0 Merge branch 'v8/contrib' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
2020-06-24 09:05:22 +02:00
Shannon
020835390d Merge remote-tracking branch 'origin/v8/feature/block-editor-list' into v8/feature/block-editor-list-validation
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklist.component.html
2020-06-24 11:56:43 +10:00
patrickdemooij9
591575b47d Added content apps for document types (#8187)
* Added content apps for document types

* PR Feedback updates

* Updated the javascript code to use Utilities

* Replace tolowercase comparison with localeCompare
2020-06-19 18:10:16 +01:00
Shannon
32e3ebb6fb Centralizes logic to validate complex editors, starts transitioning to new JSON error messages for complex editors, starts adding tests 2020-06-15 23:05:32 +10:00
Sebastiaan Janssen
567d7176a5 Importing a doctype would never assign a value to UploadedFiles, turns out we don't need UploadedFiles on the model
Additionally added a check to see if temp files were left behind and delete them to prevent errors when the same file has just been uploaded
2020-06-15 11:05:40 +02:00
Niels Lyngsø
b0b5d2ff78 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list 2020-06-15 11:05:00 +02:00
Shannon
12755e5db6 Returns ContentTypeKey from the server, updates js to use this everywhere and fix all js tests. 2020-06-11 17:16:43 +10:00
Warren Buckley
e82f504658 Adds skipStepIfVisible property to JSON Tour Steps to allow skipping if DOM item is present (#8235)
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
2020-06-09 08:55:06 +02:00
Jan Skovgaard
32a0c3b075 "Actions" drop down options do not give context to the user (#6301) 2020-05-26 17:45:39 +02:00
Bjarne Fyrstenborg
11f8628279 Lock core relation types (#8022) 2020-05-16 19:51:57 +02:00
Warren Buckley
9bce66cb5f Adds AllowSegmentVariation on the Doctype to be peristed 2020-04-29 15:29:21 +01:00
Niels Lyngsø
0e8591c728 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 2020-04-16 07:52:43 +02:00
Shannon Deminick
51d7ce0dc6 Merge pull request #7782 from PerplexDaniel/v8/feature/variationcontext-get-segment
Added GetSegment() method to VariationContext and uses it when conten…
2020-03-23 16:55:40 +11:00
Niels Lyngsø
d4dae19888 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
#	src/Umbraco.Web.UI.Client/src/less/sections.less
2020-03-11 12:00:19 +01:00
Bjarke Berg
39026258ec Merge pull request #7752 from umbraco/v8/feature/AB5435-make-umbracohelper-props-obsolete
Obsoleting UmbracoHelper properties
2020-03-11 07:40:46 +01:00
Daniël Knippers
3eb4c642c3 Added GetSegment() method to VariationContext and uses it when contentId is available 2020-03-09 17:07:56 +01:00
Bjarke Berg
6241bee1b2 Introduce methods on current, that can be necessary if not using the obsolete properties. 2020-03-04 13:49:13 +01:00
Kenn Jacobsen
384746cd26 V8: Use current client culture when searching content pickers (#7123)
* Use current client culture when searching content pickers

* Use string interpolation
2020-02-26 15:16:26 +00:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Tom Pipe
f7594b36db Ensure macromodel implements IContentModel, fixing #7504 2020-02-25 22:08:03 +01:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
2020-02-24 15:11:58 +00:00
Shannon
653616912a Fixes issue when a user's start node is below a list view and when there's list views below that 2020-02-19 13:43:48 +11:00
Niels Lyngsø
cac745fa78 segment before language in GetDisplayName 2020-02-18 13:51:03 +01:00
Daniël Knippers
12bb2a42d6 ContentVariantDisplay: add DisplayName property and use in Umbr… (#7677) 2020-02-18 11:47:58 +01:00
Daniël Knippers
5a5291d149 V8/feature/ab4550 segments ui variant picker (#7676)
* Fixes incorrect property inheritance logic

* Fixes crash in canVariantPublish when variant.language is null

* Adds variant display name in dropdown

* Logic for invariant properties updated to also support segment invariance

* Properties varied by segment only now properly saved when multiple variants are saved/published

* Logic for disabling property editors moved to function and corrected for all cases of culture/segment properties

* Fixes syntax error in less file

* Fixes empty variants returned from GetEmpty() for a ContentType set to vary by segment

* Replaced _.each with _.find to prevent having to loop through all variants and/or somehow open multiple.

It is not possible to break out of _.each using a return statement, it simply returns that current function
but _.each will continue calling the others after that.

* Added a null check on Culture prop which is now possibly null due to segments

* Makes sure segments are not completely removed when their value is null.

During save/publish, Umbraco first deletes all property data of a specific version
and then adds property values again. However, any segments that were created but had
an empty value would not be added again which meant the segments were entirely gone afterwards.

* GetSegments() updated to always return the default segment, not only when there are no segments at all.

This makes sure that even if there is no property data for the default segment in the database but only for
some segments, the default segment will still be returned here.
2020-02-18 11:46:31 +01:00
Daniël Knippers
1a4e6e564c Review Perplex change for Segments (#7659)
* Fixes incorrect property inheritance logic

* Fixes crash in canVariantPublish when variant.language is null

* Adds variant display name in dropdown

* Logic for invariant properties updated to also support segment invariance

* Properties varied by segment only now properly saved when multiple variants are saved/published

* Logic for disabling property editors moved to function and corrected for all cases of culture/segment properties

* Fixes syntax error in less file

* Fixes empty variants returned from GetEmpty() for a ContentType set to vary by segment
2020-02-14 15:16:50 +01:00
Shannon
7182be93d9 Ensures that we don't set IsChildOfListView when it's a user's start node since we are actually rendering that tree node when that is the case 2020-02-12 13:47:48 +11:00
Benjamin Carleski
c63af8e161 Merge pull request #7616 from umbraco/temp-7538-image-url-generator
Introduce Image URL Generator abstraction
2020-02-11 10:30:48 -08:00
Bjarke Berg
ad8d908ddf Merge pull request #7550 from stevetemple/v8/feature/obsolete-publishedcontent-url
Obsolete Url on IPublishedContent
2020-02-11 13:09:46 +01:00
Bjarke Berg
3c1076e023 Merge pull request #7544 from stevetemple/v8/feature/obsolete-creatorname-writername
Obsolete CreatorName and WriterName on IPublishedContent
2020-02-11 13:08:15 +01:00
Niels Lyngsø
0b730968ed get and set AllowSegmentVariant 2020-02-10 14:39:05 +01:00
Niels Lyngsø
87b9642d1a Merge branch 'v8/feature/AB4550-segments-clientcode' into v8/feature/AB4550-segments-ui-variant-picker 2020-02-10 11:34:29 +01:00
Benjamin Carleski
4309489174 Make changes for PR suggestions 2020-02-09 11:12:29 -08:00
Benjamin Carleski
408ee452e1 Code cleanup, added unit tests 2020-02-08 11:05:14 -08:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Niels Lyngsø
555be8dd0a first part of enabling allow segments 2020-02-06 12:47:50 +01:00
Robert Foster
a3bf9d2a51 Renamed "DermineIsChildOfListView" to "DetermineIsChildOfListView" 2020-02-02 13:00:40 +01:00
Steve Temple
a8672790d3 Obsolete Url on IPublishedContent 2020-02-01 13:38:14 +00:00
Steve Temple
b95d674092 Tidy up formatting 2020-01-31 09:50:37 +00:00
Steve Temple
377f1925ea Obsolete CreatorName and WriterName on IPublishedContent 2020-01-31 09:34:08 +00:00
Nathan Woulfe
902d4196cf add dialog for change password, shift form from user details view int… (#7450) 2020-01-27 06:29:04 +01:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +01:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
2020-01-22 08:36:32 +00:00
Sebastiaan Janssen
a4a6b77fc1 Merge branch 'v8/contrib' into v8/dev
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
2020-01-21 18:58:03 +01:00
Warren Buckley
466f8ca185 V8: Email Marketing Opt In (#7366)
* Enable BackOfficeTours to have a bool to hide them in the help drawer

* New hidden tour to display the email marketing option on login to backoffice

* Update to tourService to use the new bool property of hidden to show/hide the tour in the help drawer

* AngularJS Resource to call the Azure Function EmailService proxy code - currently set to DEV

* New method on userService.addUserToEmailMarketing that in turn calls the new emailMarketingResource

* New AngularJS view & controller in the tour step to deal with user clicking yes/accept to the email opt-in

* Modifies the init script to auto launch the hidden email marketing tour at login
If it has been accepted or dismissed before we then try to launch the original intro tour

* Only show the email marketing tour when the intro tour has been dismissed or completed and will appear for one time only the next time you login

* When using X to close email tour, it does not disable and never show it again but just closes it, similar to intro tour

* Adds new localStorageService key for 'emailMarketingTourShown' to prevent the tour being shown again in the same logged in session, if you refresh the backoffice in your browser

* Update URL to email function

* Adding new COMA copy for email marketing tour - needs fine tuning pixel pushing from Niels L

* Prettified layout of e-mail marketing promotion tour

* fixing whitespace

* text=auto

* adding xml to gitattributes

* Ensures the email tour is not shown if you dismiss the intro tour and manually refresh the page

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
2020-01-21 08:56:51 +01:00
Shannon
4cf204f8f5 Merge branch 'v8/dev' into v8/feature/media-tracking
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
2020-01-21 13:40:16 +11:00
Kenn Jacobsen
c27634d8a9 V8: Allow reordering of allowed child types (#4927)
* Allow explicitly sorting allowed child types for content types

* Allow explicitly sorting allowed child types for media types

* Remove console.log

* Fix the mapping of allowed content types (after introduction of the new mapper)

* Fix sorting after merge
2020-01-19 09:50:18 +00:00