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

31952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lyngsø
3672048c60 clean up 2020-01-23 19:17:40 +01:00
Niels Lyngsø
9215575f19 remove comment 2020-01-23 19:14:22 +01:00
Niels Lyngsø
2f2fc72500 correct binding 2020-01-23 19:14:14 +01:00
Niels Lyngsø
d4d7425c24 Refactoring part 2 of umb-editor, splitview, variants. 2020-01-23 19:09:48 +01:00
Niels Lyngsø
f302b373ac basic tests for segments validation 2020-01-23 17:00:14 +01:00
Niels Lyngsø
58adb42930 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui 2020-01-23 15:04:22 +01:00
Niels Lyngsø
30be926949 Refactorying of umb-editor, splitview, variants 2020-01-23 14:50:58 +01: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
Niels Lyngsø
109d9e1f7b implement segment support 2020-01-23 11:26:55 +01:00
Shannon
52b93bfc9c ensures only _sqlServerSyntax is used 2020-01-23 18:33:55 +11:00
Shannon
8d7ed7dd32 adds const fixing naming 2020-01-23 16:26:13 +11:00
Shannon
201927580c Fixing accidental api signature breaking change 2020-01-23 16:23:27 +11: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
Niels Lyngsø
4a028ed22c renaming getCultureCallbacks to getVariantCallbacks, for segment support. 2020-01-22 11:47:48 +01:00
Niels Lyngsø
5acca8c416 adding missing segment argument 2020-01-22 11:40:53 +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
Niels Lyngsø
686e1beb74 Apply segments for validation, client side. 2020-01-22 10:40:56 +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
Niels Lyngsø
5246e535e6 Merge remote-tracking branch 'PerplexDaniel/feature/backoffice-segment-support-client' into v8/feature/AB4550-segments-ui 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
 2020-01-22 09:22:39 +01:00
Bjarke Berg
efd4512e64 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 2020-01-22 09:18:30 +01:00
Niels Lyngsø
8030901184 Fix mistakes made in commit a4a6b77 2020-01-22 08:36:52 +01: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
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
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
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