Commit Graph

31951 Commits

Author SHA1 Message Date
Niels Lyngsø 355fe6be21 Remember user filtering 2020-02-11 12:12:01 +01:00
Niels Lyngsø 72ff7ab8f1 on blur event for umb-mini-search 2020-02-11 12:11:32 +01:00
Kenn Jacobsen 94d9acdeee Prevent multi URL picker from crashing with JS errors when absolute (non-local) links are added.
(cherry picked from commit 2c9c5baae5)
2020-02-11 10:06:47 +01:00
Nathan Woulfe b32e8c5f16 update angular-aria to 1.7.9 (#7606)
(cherry picked from commit d1503eba03)
2020-02-10 11:48:39 +01:00
Nathan Woulfe d96bcae5c8 7168 hotkeys in rte (#7604)
(cherry picked from commit 608555126e)
2020-02-10 11:48:38 +01:00
Warren Buckley 1fa8157e4c Merge pull request #7602 from umbraco/v8/bugfix/AB4932-track-refs-all-variants
Ensures that we track relations for values on all variant property values
2020-02-10 10:43:46 +00:00
Shannon 636d0c9ccd Ensures that we track relations for values on all variant property values 2020-02-07 12:18:27 +11:00
Warren Buckley 97aa19c7a6 Merge pull request #7556 from umbraco/dependabot/npm_and_yarn/src/Umbraco.Web.UI.Client/tinymce-4.9.7
8.6RC: Bump tinymce from 4.9.2 to 4.9.7 in /src/Umbraco.Web.UI.Client

(cherry picked from commit 45e4e39412)
2020-02-06 08:53:24 +00:00
Shannon e3b0d8df61 changes install background 2020-02-05 12:41:51 +11:00
Shannon 4698ce70d3 Fixes issue with upgrading from v7 -> 8.6
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/AddDatabaseIndexesMissingOnForeignKeys.cs
2020-02-04 16:43:36 +11:00
Shannon 3d0543922a un-breaks ctor 2020-02-03 22:48:00 +11:00
Warren Buckley 3ad1bb9e12 Added "rc" to AssemblyInformationalVersion for 8.6.0-rc 2020-01-24 09:06:33 +00:00
Warren Buckley f486db89d4 Merge pull request #7498 from umbraco/v8/feature/upgrade-npm-dependencies
upgrade npm dependencies
2020-01-24 08:52:36 +00:00
Bjarke Berg 257ea6c1c3 Merge remote-tracking branch 'origin/v8/8.5' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
2020-01-24 09:32:34 +01:00
Bjarke Berg 4cf78d6ef0 Bump version to 8.5.3 2020-01-24 09:22:34 +01:00
Bjarke Berg 7bdf97c431 https://github.com/umbraco/Umbraco-CMS/issues/7469 Unsealed class to allow override 2020-01-24 09:20:16 +01:00
Bjarke Berg 05fe604e22 https://github.com/umbraco/Umbraco-CMS/issues/7469 Renamed extension method to avoid ambiguous signature 2020-01-24 09:19:29 +01:00
Bjarke Berg 384ecbe22a Removed reference from Umbraco.Web.UI to Umbraco.TestData 2020-01-24 08:25:03 +01:00
Niels Lyngsø 7fc0f01887 fixed versions for angular + npm 2020-01-23 15:23:32 +01:00
Niels Lyngsø aaf53921eb upgrade to Angular 1.7.9 + npm 6.13.6 2020-01-23 15:15:48 +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
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
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
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 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