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

10278 Commits

Author SHA1 Message Date
Warren Buckley
1fe7de0b5f Merge pull request #7166 from umbraco/v8/feature/7133-do-not-paste-keys-in-nested-content 
Cherry picked from SHA 49c438b55f

NC keys: Do not copy keys for Nested Content (Fix for #7133)
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-05-29 17:03:39 +01:00
Shannon
9f2c1cd3e6 when we rebuild indexes in the back office we are actually calling index.CreateIndex() 2 times before populating 
(cherry picked from commit d7469e6576)
 2020-05-27 10:14:03 +02:00
Jeavon Leopold
b2c2e86971 Add GetMainDom method to UmbracoApplication so GetRuntime can be overridden 
(cherry picked from commit c3f59602c2)
 2020-05-27 10:11:44 +02:00
Shannon
0b1e1e6dfe Cherry pick: Adding section value check in the query string #8061 2020-05-07 15:48:38 +10:00
Sebastiaan Janssen
41f98a41fb Added fix from #7832 since the test was somehow cherry picked into 8.6.1 already 2020-04-16 14:58:56 +02:00
Shannon Deminick
4a071f6e05 Nucache NullReferenceException when copying (#7961) 
(cherry picked from commit b30db05cc7)

# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
 2020-04-15 20:55:11 +02:00
mattchanner
d0eee32f1d Added null check on raw JSON to prevent null reference error deserializing the grid 
(cherry picked from commit bcea0f645a)
 2020-04-09 16:51:02 +02:00
Benjamin Carleski
5f5773b0c0 7879: Handle for multiple picked media relations 
(cherry picked from commit 9f7c44c64e)
 2020-04-09 16:50:41 +02:00
Sebastiaan Janssen
5531c7300d Update dependency for 8.5.5 
(cherry picked from commit 2d3388d6d3)

# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:02:01 +01: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
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
Shannon
8dc9d4ace4 Updates c# ShouldRenderChildrenOfContainer to allow for nested list views 2020-02-12 11:44:57 +11:00
Shannon
3d0543922a un-breaks ctor 2020-02-03 22:48:00 +11:00
Bjarke Berg
fd11ef6ed1 Merge pull request #7306 from umbraco/v8/bugfix/AB3323-SqlMainDom 
Introduce a new IMainDomLock and both default and sql implementations
 2020-01-23 12:44:11 +01:00
Shannon Deminick
238db1c908 Merge pull request #7430 from ronaldbarendse/v8/bugfix/enum-extensions 
Clean up EnumExtensions
 2020-01-23 15:03:51 +11:00
Bjarke Berg
db27090ac0 Merge pull request #7233 from umbraco/v8/bugfix/6758-nucache-fix 
When nucache updates are made the previous Gen root node is cleared
 2020-01-22 11:13:43 +01:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +01:00
Bjarke Berg
1dfdfba236 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2020-01-22 09:39:06 +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
Bjarke Berg
b84961bcbc Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2020-01-22 07:06:43 +01:00
Shannon Deminick
3fa969eef2 Merge pull request #7400 from bielu/allow-override-internalsearch-constants 
Add possibility to override internal hardcoded configs for backoffice search
 2020-01-22 11:18:32 +11: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
abi
0d12852cd8 Address Shannon comments 
Add code documentation, return empty enumerable instead of allocate empty list
 2020-01-21 09:07:10 +00: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
Andy Butland
bc82ccd824 Prevented user from changing a document type to an element type if it's already been used to create content (#5668) 2020-01-19 09:34:04 +00:00
Kenn Jacobsen
bcf4c97270 V8: Support culture variant URLs in multi URL picker (#7130) 
Thanks, Kenn - great work as usual 👍
 2020-01-17 12:58:18 +00:00
Sebastiaan Janssen
12e88fde42 Merge branch 'v8/dev' into v8/contrib 2020-01-17 10:07:06 +01:00
Bjarke Berg
6d92f5915a Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-15 13:44:42 +01:00
Shannon
6f420b9577 Merge branch 'v8/bugfix/contentquery-search' of https://github.com/ronaldbarendse/Umbraco-CMS into ronaldbarendse-v8/bugfix/contentquery-search 2020-01-15 12:18:52 +11: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
3e71de4698 ensure locks the data types 2020-01-13 22:28:25 +11:00
Shannon
71b3aa1cb0 Removes the need for checking variant when binding content 2020-01-13 22:16:19 +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
Shannon
d26334ad39 Fixes the issue of manipulating data for an existing Gen, adds notes, makes the Gen comparison operator consistent. 2020-01-13 17:16:55 +11:00
Kenn Jacobsen
2906eafa79 V8: Make it possible to hide anchor/querystring input in the li… (#7031) 
Wonderful work
 2020-01-10 19:14:11 +00:00
Dave Woestenborghs
f92d0b59bd Make sure the configured url provider mode is used when getting a url (#7189) 2020-01-10 10:41:37 +01: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
Kenn Jacobsen
a1b8d4a097 Don't load duplicate nodes for editors with start nodes 2020-01-08 19:46:35 +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
joepvtl
2908ecac64 7058 NullOrEmpty check to fix Grid in NestedContent (#7080) 2020-01-07 17:31:25 +01:00
Claus
7ad46130e4 Merge remote-tracking branch 'origin/v8/8.4' into v8/8.5 2020-01-07 13:06:34 +01:00
Daniël Knippers
24afe3f130 Changed ArgumentException to InvalidOperationException 2020-01-07 09:34:12 +01:00
Sebastiaan Janssen
d988d07c5d Merge branch 'v8/dev' into v8/contrib 2020-01-06 14:34:17 +01:00