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

31910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Poornima Nayar
df8f281141 Merge pull request #7045 from ronaldbarendse/v8/bugfix/nested-content-defaultpropertyvalueconverters 
Add DefaultPropertyValueConverterAttribute to core Nested Content PropertyValueConverters
 2020-01-23 11:26:13 +00:00
Sebastiaan Janssen
a9d45413c8 Merge branch 'v8/dev' into v8/contrib 2020-01-23 09:04:57 +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
Dave Woestenborghs
d61090a225 #7452 set save state correctly for variant when setting schedule publishing 2020-01-22 21:27:35 +01:00
Ronald Barendse
c4da5703fd Merge changes 2020-01-22 11:40:41 +01:00
Ronald Barendse
1cc6a8cb45 Rename SetVariesBy to SetFlag on the enum overload 2020-01-22 11:14:31 +01:00
Sebastiaan Janssen
ac675d14e9 Fixes build errors 2020-01-22 11:13:49 +01: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
6c2e1b29fd Use SetVariesBy extension methods instead of SetFlag/UnsetFlag 2020-01-22 11:10:56 +01:00
Ronald Barendse
10f15a7648 Remove duplicate VariesBySegment overload after merge 2020-01-22 11:10:28 +01:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +01:00
Sebastiaan Janssen
a7b580b552 Merge branch 'v8/dev' into pr/7430 2020-01-22 10:56:21 +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
794976dda7 Merge branch 'v8/dev' into v8/contrib 2020-01-22 08:55:42 +01:00
Niels Lyngsø
8030901184 Fix mistakes made in commit a4a6b77 2020-01-22 08:36:52 +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
Anders Bjerner
63bd28f8c1 Merge pull request #7477 from MarcStoecker/patch-4 
Fix typo in DE "installFinish" caption
 2020-01-21 23:01:58 +01:00
Anders Bjerner
fecd09cf9d Merge pull request #7488 from JeffDess/v8/contrib 
Fix typo in contentTypeSavedHeader French label
 2020-01-21 22:48:46 +01:00
Sebastiaan Janssen
163c1f7028 Fix automatic merge gone wrong 2020-01-21 19:16:07 +01: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
Jean-François Dessureault
204e0841af Fix typo in contentTypeSavedHeader French label 
"documet" should read "document"
 2020-01-21 10:48:21 -05: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
Bjarke Berg
7a113ca386 Merge pull request #7482 from umbraco/v8/dev-merge-8.5 
Merge of 8.5 into v8/dev
 2020-01-21 09:03:16 +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
Bjarke Berg
832c699fc4 Merge remote-tracking branch 'origin/v8/8.5' into v8/dev-merge-8.5 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-21 08:10:12 +01:00
Shannon
be38b96391 fixes up the AddSegmentData endpoint 2020-01-21 13:52:53 +11: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
Shannon
8cc78631a0 Adds TestData project along with test endpoints for enabling/disabling segments 2020-01-21 13:33:39 +11:00
Bjarke Berg
7fbe482919 Revert "https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue" 
This reverts commit baef282b
 2020-01-20 14:09:13 +01:00
Marc Stöcker
9a7b72c8c1 Fix typo in DE "installFinish" caption 
(and improve wording: "Abschließen" (~ completing something) instead of "Quit" or "Close" as it was; EN is "Finishing")
 2020-01-20 13:39:22 +01:00
Warren Buckley
d378495942 Log message format fix for PR6617 2020-01-20 09:11:29 +00: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
Ronald Barendse
b3829bfff8 Reorder methods to keep overloads adjacent 2020-01-17 22:44:44 +01:00
Ronald Barendse
d9dfea8ef5 Add remarks and better summary on SetVariesBy extension methods 2020-01-17 22:43:11 +01:00
Ronald Barendse
05f7d24a9a Add VariesBySegment and VariesByCultureAndSegment extension methods for ISimpleContentType 2020-01-17 22:42:24 +01:00
Claus
df1e006b9f Merge pull request #7470 from umbraco/v8/hotfix/7469-ambiguous-extension-method 
https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed  Ambiguous…
 2020-01-17 14:32:18 +01: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
Bjarke Berg
baef282b10 https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue 2020-01-17 13:53:03 +01:00
Bjarke Berg
6637bf520c https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue 2020-01-17 13:22:13 +01:00
Bjarke Berg
5ddc4b8efb Bump version to 8.5.2 2020-01-17 11:51:31 +01:00
Sebastiaan Janssen
12e88fde42 Merge branch 'v8/dev' into v8/contrib 2020-01-17 10:07:06 +01:00
Bjarke Berg
dc7e0e41d9 Merge pull request #7467 from umbraco/v8/hotfix/7466-lazy-eval-mb-mode 
V8: Bugfix - Lazy evaluate MB mode
 2020-01-17 06:50:53 +01:00
Shannon
1b56922213 Fixes threadsafety for settings value 2020-01-17 13:31:22 +11:00
Kenn Jacobsen
f3d9a01800 Hide the "Add" button for Nested Content in "single mode" (#7327) 2020-01-16 22:00:28 +00:00
Bjarke Berg
b272a3b791 https://github.com/umbraco/Umbraco-CMS/issues/7466 - Fixes issue with external ModelsBuilder and Dll or LiveDll mode. The issue is because the Mode is determined in the contructor, and not lazy. 2020-01-16 19:39:17 +01:00
Kieron Boswell
f5a5a9a297 Spelling mistake in comments of partial snippet (#6975) 2020-01-16 17:19:54 +01:00
Kieron Boswell
4d5f34a63d Spelling mistake on word Success in instructional comment. (#6966) 2020-01-16 17:15:07 +01:00
Jan Skovgaard
4c68f7e53a List view configuration - Sort order distance fix (#6905) 
Thanks, Jan. You're a 🌟
 2020-01-16 15:13:25 +00:00
Anders Bjerner
c127bedb93 Responsive Angular API documentation (#7030) 2020-01-16 15:11:08 +00:00