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

5106 Commits

Author SHA1 Message Date
Bjarke Berg
392828fcb2 Merge branch 'netcore/feature/use-request-cache-instead-of-httpcontext-items' into netcore/feature/move-files-after-umbraco-context-abstractions 2020-02-13 12:28:50 +01:00
Bjarke Berg
215cb60b15 Refactored usages of HttpContext.IsDebuggerEnabled to use the IHostingEnvironment.IsDebugMode 2020-02-13 07:56:50 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2020-02-11 16:53:13 -08:00
Bjarke Berg
9449ed9a4d Fix views 2020-02-11 10:28:34 +01:00
Bjarke Berg
ef7af69731 https://github.com/umbraco/Umbraco-CMS/issues/7138 - Injected IIOHelper (#7581) 
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-02-10 11:23:23 +01:00
Bjarke Berg
b850b3c8fe AB4950 - Created new Umbraco.Web.BackOffice project. Moved dashboards into this new project (#7615) 2020-02-10 09:06:29 +01:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Bjarke Berg
35a736e6cd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/IO/SystemDirectories.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
 2020-02-07 10:04:28 +01:00
Bjarke Berg
d147b182ee Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. 2020-02-06 14:40:46 +01:00
Bjarke Berg
0bc843b06d Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-06 14:09:23 +01:00
Bjarke Berg
a018315404 Removed references from web and Models builder.. Moved some classes to do so 2020-02-06 14:09:16 +01:00
Bjarke Berg
e13c17b02d Updated and aligned nuget package versions 2020-02-05 08:43:23 +01:00
Bjarke Berg
a3867d93dd Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) 2020-02-05 08:17:30 +01:00
Andy Butland
41fde9318d Restored accidental change of csproj 2020-02-04 19:19:51 +01:00
Bjarke Berg
bc6f79ef5b Fixed views after moving extension methods 2020-02-04 09:50:32 +01:00
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00
Bjarke Berg
47ca4a0207 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/3679-examine-netstandard 2020-02-03 14:18:27 +01:00
Andy Butland
171fce2ecb Moved PublishedCache from Umbraco.Web into .Net standard project. 
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
 2020-01-30 20:08:03 +01:00
Kenn Jacobsen
da20bf0b56 V8: Change "Include subfolders in search" to "Search only in th… (#4720) 
Lots of lovely work here - this is one of those PRs that show how good communication can really make the experience of contributing one of learning for all parties. Thanks Kenn and all who contributed their time here
 2020-01-30 10:45:50 +00:00
emma burstow
a076f10765 Merge branch 'v8/contrib' into pr/5626 2020-01-30 10:29:57 +00:00
Bjarke Berg
f1daa125e6 Fix for merge issue with ports 2020-01-29 19:54:05 +01:00
Kenn Jacobsen
b6a073a12e Add missing documentation for web.routing in umbracoSettings.config (#7468) 
Cheers Kenn :)
 2020-01-29 16:54:56 +00:00
Bjarke Berg
03f1faf20d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Models/ChangingPasswordModel.cs
#	src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
 2020-01-29 09:22:45 +01:00
Shannon
958118fc7f removes duplicate lines in csproj 2020-01-29 14:20:17 +11:00
Shannon
ecf5a5efbc reverts accidental change 2020-01-29 12:46:16 +11:00
Shannon
69f4ea5484 Renames Umbraco.Examine project to Umbraco.Examine.Lucene for the Lucene implementation part 2020-01-28 17:09:45 +11:00
Shannon
58537ce11a Updates to newer 2.0 version of Examine which has Examine.Core as netstandard 2020-01-28 15:21:58 +11:00
Bjarke Berg
a1ed2eb135 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-27 14:22:04 +01:00
Nathan Woulfe
902d4196cf add dialog for change password, shift form from user details view int… (#7450) 2020-01-27 06:29:04 +01:00
Sebastiaan Janssen
41dc8d915b Merge branch 'v8/dev' into v8/contrib 2020-01-26 10:37:11 +01:00
Warren Buckley
8bf457a88d Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0 2020-01-24 09:10:54 +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
Sebastiaan Janssen
d45ef632f1 Merge branch 'v8/dev' into v8/contrib 2020-01-24 09:01:37 +01:00
Bjarke Berg
384ecbe22a Removed reference from Umbraco.Web.UI to Umbraco.TestData 2020-01-24 08:25:03 +01:00
Bjarke Berg
1bfb64bdd8 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2020-01-23 13:16:49 +01:00
Shannon Deminick
3b63d9baa3 Merge pull request #7486 from umbraco/netcore/feature/AB4635-move-cache-refreshers 
NetCore:  Moved CacheRefreshers to abstractions
 2020-01-23 20:18:48 +11:00
Sebastiaan Janssen
a9d45413c8 Merge branch 'v8/dev' into v8/contrib 2020-01-23 09:04:57 +01:00
Bjarke Berg
47c211907a AB4635 - Fixed up some of the review comments - Removed static (de)serializers and get the CacheRefresher from the collection 2020-01-22 14:09:20 +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
Benjamin Carleski
fd3ef48367 Use dependency injection for config classes 2020-01-21 17:25:03 -08: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
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
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
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
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