yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,998 Commits 4 Branches 7 Tags
32a30aad97eb374c406a8aeac8d57704e4e8d46a
Commit Graph

1662 Commits

Author SHA1 Message Date
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
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
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
Sebastiaan Janssen
0ba5a0ab25 Merge branch 'v8/dev' into v8/contrib 2020-01-14 08:46:43 +01:00
Shannon
63fab6a56b adds notes 2020-01-14 11:47:31 +11:00
Shannon
d9d3e6847f Merge remote-tracking branch 'origin/v8/dev' into v8/feature/7212-segment-support 2020-01-13 21:33:26 +11:00
Shannon Deminick
eeb4f172bc Merge pull request #7212 from PerplexDaniel/feature/backoffice-segment-support-server 
Segments in Backoffice: Server code
 2020-01-13 21:31:24 +11:00
Dave Woestenborghs
eeaa5a82d4 V8/doctype tours (#6980) 2020-01-10 10:39:22 +01:00
Poornima Nayar
1cd30aae99 Merge pull request #6943 from kjac/v8/fix/protect-system-media-types 
V8: Protect "system media types" from alias changes and deletion
 2020-01-09 14:18:10 +00:00
Ronald Barendse
c38240c872 Add SetVariesBy extension methods for ContentVariation 2020-01-09 09:35:37 +01:00
Bjarne Fyrstenborg
0dfd7679e0 Request datatype by guid (#6847) 2020-01-08 19:02:16 +01:00
Ronald Barendse
cae2c32172 Remove SetFlag and UnsetFlag extension methods 2020-01-07 20:32:04 +01:00
Daniël Knippers
24afe3f130 Changed ArgumentException to InvalidOperationException 2020-01-07 09:34:12 +01:00
Rob Maas
809ab6d05f Added ContentApps for Members (#6670) 2019-12-18 10:43:41 +01:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Daniël Knippers
491ab5c44f Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into feature/backoffice-segment-support-server 2019-11-22 14:06:10 +01:00
Daniël Knippers
06074ead44 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into pr/6691_vary-by-culture-set-unset-culture-flag-only 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
 2019-11-22 09:08:27 +01:00
Warren Buckley
9fea3ea500 Merge branch 'feature/5702-custom-validation-messages' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-feature/5702-custom-validation-messages 
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
 2019-11-21 10:10:15 +01:00
Shannon Deminick
b68f1d44f1 Merge pull request #6599 from ronaldbarendse/v8/bugfix/5947-custom-exceptions 
Fixed and cleaned up custom exception classes
 2019-11-21 19:21:19 +11:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Warren Buckley
31b85a2cd6 Remove code duplication & do some cleanup - need to work on passing the type variable to Cast<T> 2019-11-18 11:43:31 +00:00
Warren Buckley
8773d644aa Implement paging for the three entity types that media can be related to 2019-11-15 12:50:44 +00:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Jeavon
88f6ddeae4 Code tweaks from PR review - also led to adding logging for Deserialization issues and therefore needing to mock the logger for the tests 2019-11-13 12:07:11 +00:00
Warren Buckley
05c1f0f389 Fix up the missing nulls & ammend the mapping 2019-11-12 14:50:43 +00:00
Warren Buckley
8dcec429d3 Remove relations for the RelationType overview 2019-11-11 15:16:19 +00:00
Shannon
28600a02bd Merge remote-tracking branch 'origin/v8/feature/media-tracking' into v8/feature/3449-relations-paging 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
 2019-11-11 21:25:35 +11:00
Warren Buckley
bf2727a1eb New model to return from WebAPI 2019-11-06 13:40:00 +00:00
Shannon
f7e8a53922 Revert "Gets entity repository to be able to return a mix of object types" 
This reverts commit fff3d2648f.
 2019-11-05 15:53:50 +11:00
Shannon
602acce8f4 Gets entity repository to be able to return a mix of object types 2019-11-05 15:50:49 +11:00
Shannon
fff3d2648f Gets entity repository to be able to return a mix of object types 2019-11-05 15:05:51 +11:00
Shannon
595b36c5df Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
 2019-11-01 13:27:13 +11:00
Daniël Knippers
965d6cbeb7 Added enum extension methods + tests for SetFlag and UnsetFlag. 2019-10-30 11:04:53 +01:00
Jeavon
04004876b1 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-10-29 12:13:09 +00:00
Kenn Jacobsen
546a948d0b Protect "system media types" from alias changes and deletion 2019-10-29 12:13:42 +01:00
Kenn Jacobsen
b1037786ca V8: Use member type icon in member pickers (#6696) 2019-10-24 20:46:01 +02:00
Shannon
f656f7d0a0 Fixes relations editor and loading in relations, allows creating relations without object types, fixes migration 2019-10-24 22:38:11 +11:00
Shannon
ae64fe49be Allows relation types to not have specific object types, updates IRelation to return the actual object types for the ID references, now relations can be more flexible without being strangely tied to specific object types based on the relation type. 2019-10-24 21:32:00 +11:00
Bjarke Berg
c072015288 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB2913-DataTypeTracking 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2019-10-21 09:40:21 +02:00
Bjarke Berg
ba215f8700 fix name to follow the class name 2019-10-21 09:34:35 +02:00
Daniël Knippers
1a92dbfd8f Properly set / unset Culture flag instead of removing _all_ flags when "Vary by Culture" is false. 2019-10-15 10:54:51 +02:00
Daniël Knippers
1da29b29b9 Only set segment on property when property can be varied by segment 2019-10-11 14:48:55 +02:00
Daniël Knippers
813998a614 Support for saving edited segment values 2019-10-11 14:48:54 +02:00
Daniël Knippers
8f0ee6d711 Added support for all 4 cases in ContentVariantMapper 2019-10-11 14:48:54 +02:00
Daniël Knippers
74727a179c Adds Segment to ContentItemDisplay and update Variants to include segmented variants. 2019-10-11 14:48:54 +02:00