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

32665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Carleski
c9bbb158be Remove obsolete Stylesheet constant and references 2020-01-21 17:50:20 -08:00
Shannon Deminick
656585b2dc Merge pull request #7438 from umbraco/netcore/feature/AB4385-move-content-apps-to-abstractions 
Netcore:  Move content apps to abstractions
 2020-01-22 12:43:56 +11:00
Benjamin Carleski
ae25845f2b Correct cut-and-paste error 2020-01-21 17:40:13 -08:00
Benjamin Carleski
fd3ef48367 Use dependency injection for config classes 2020-01-21 17:25:03 -08: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
elitsa
1bf1a86f94 Commenting out the Starter Kit installation for now as it isn't compatible 2020-01-21 15:41:35 +01:00
Bjarke Berg
f95b99676a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4385-move-content-apps-to-abstractions 2020-01-21 14:29:27 +01:00
Bjarke Berg
17ee7796f4 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4635-move-cache-refreshers 2020-01-21 14:24:53 +01:00
Bjarke Berg
258dcef773 Merge pull request #7460 from umbraco/netcore/feature/AB4549-Move-models-from-web 
Netcore: Move models from web to abstractions and infrastructure
 2020-01-21 14:22:20 +01:00
elitsa
9ef5f74d67 Removing unnecessary namespace from in-line file reference 2020-01-21 13:50:37 +01:00
elitsa
bda64d75ba Removing the usage of Current 2020-01-21 13:47:21 +01:00
Bjarke Berg
0cdd6ba29d AB4635 - Moved CacheRefreshers to abstractions 2020-01-21 13:40:23 +01:00
Bjarke Berg
f3107c6f55 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4385-move-content-apps-to-abstractions 2020-01-21 11:07:42 +01:00
Bjarke Berg
68e3fe275a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/PackageInstallController.cs
 2020-01-21 11:05:48 +01:00
Bjarke Berg
928f774bfd Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-01-21 10:51:43 +01:00
Bjarke Berg
d533631dff Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-01-21 10:51:36 +01:00
Bjarke Berg
bdf29f315f Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-01-21 10:51:16 +01:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Bjarke Berg
3978ad95df Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:50:26 +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
8b4c291d44 Merge pull request #7472 from benjaminc/netcore/feature/7368-CleanupObsoletes 
Netcore/feature/7368 cleanup obsoletes
 2020-01-21 10:04:36 +01: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
Bjarke Berg
1ee09af4f3 7368 - Updated view to use the new name of ReplaceLineBreaksForHtml 2020-01-21 09:01:11 +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
Benjamin Carleski
25e58665ba Merge remote-tracking branch 'umbraco/netcore/dev' into netcore/feature/7368-CleanupObsoletes 2020-01-20 14:26:58 -08:00
Benjamin Carleski
fceac19f04 Update controllers to include UmbracoMapper 2020-01-20 14:15:54 -08:00
Benjamin Carleski
7284ab0400 Remove obsolete UmbracoApiControllerBase constructor 2020-01-20 11:55:49 -08:00
Benjamin Carleski
421ed582da Remove obsolete UmbracoIndexesCreator methods 2020-01-20 11:50:08 -08:00
Benjamin Carleski
d35b3468e2 Remove obsolete RebuildIndexes method 2020-01-20 11:46:03 -08:00
Benjamin Carleski
cd4f646ed0 Remove obsolete PublishedContentQuery constructor 2020-01-20 11:45:44 -08:00
Benjamin Carleski
f463fae047 Fix BuilderTests reference 2020-01-20 11:26:18 -08:00
Benjamin Carleski
628373f7a4 Remove obsoletes Umbraco.Infrastructure 2020-01-20 11:26:01 -08:00
Benjamin Carleski
0c1d54ba4d Remove unused obsoletes from Umbraco.Web.UI.Client 2020-01-20 11:07:13 -08:00
Benjamin Carleski
66e32148b2 Remove unused obsoletes from Umbraco.Abstractions 2020-01-20 11:06:29 -08:00
Bjarke Berg
3279098f02 AB4549 - Moved mappers 2020-01-20 15:48:03 +01:00
Bjarke Berg
e45ff0b63d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web 2020-01-20 15:44:15 +01:00
Bjarke Berg
f4caf75ced Merge pull request #7476 from umbraco/netcore/feature/AB4519-move-more-property-editors-to-infrastructure 
Netcore: Move property editors to Infrastructure or Abstractions (2nd part)
 2020-01-20 15:43:14 +01:00
Bjarke Berg
9fa18fe9a3 AB4549 - Moved more models 2020-01-20 15:20:21 +01:00
elitsa
beb55ccd23 Moving property editors to Abstractions project 2020-01-20 15:11:54 +01: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