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

1724 Commits

Author SHA1 Message Date
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
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00
Robert Foster
a3bf9d2a51 Renamed "DermineIsChildOfListView" to "DetermineIsChildOfListView" 2020-02-02 13:00:40 +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
Shannon
5b5aa4c499 All Lucene based logic is part of Umbraco.Examine.Lucene, no other part of Umbraco now knows about Lucene at all. 2020-01-29 12:24:57 +11:00
Shannon
0695d308c2 Moves remaining non-lucene stuff 2020-01-28 17:07:06 +11:00
Shannon
0343b302f3 Moving stuff to Examine2 (temp name) as a netstandard project, updates to latest Examine netstandard, moves constants to separate class. 2020-01-28 16:37:55 +11:00
Bjarke Berg
3b7825b30d Netcore: Moves services and dependencies from Web to Abstractions (#7497) 
* Moves the services and dependencies from web,

* Fix bug with Empty collection not being a property (new one for each access)

* remvoed moved files from web csproj

* Fix spelling
 2020-01-27 09:31:24 +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
Bjarke Berg
a9e6919420 Merge pull request #7496 from benjaminc/netcore/feature/7369-remove-current-services 
Replace Current.Services references with DI where possible
 2020-01-23 13:39:59 +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
Benjamin Carleski
a379e01578 Replace Current.Services references with DI where possible 2020-01-22 21:43:25 -08:00
Ronald Barendse
b01f2ed35e Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions 2020-01-22 11:04:11 +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
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
elitsa
bda64d75ba Removing the usage of Current 2020-01-21 13:47:21 +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
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
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
Bjarke Berg
3279098f02 AB4549 - Moved mappers 2020-01-20 15:48:03 +01:00
Bjarke Berg
9fa18fe9a3 AB4549 - Moved more models 2020-01-20 15:20:21 +01:00
Bjarke Berg
5a67e5b395 AB4549 - Moved more models 2020-01-20 11:37:19 +01: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
Bjarke Berg
4ff0f2f51a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web 2020-01-15 13:42:55 +01:00
Bjarke Berg
1e5c00878b AB4549 - Moved models from web to abstractions and infrastructure 2020-01-15 09:05:52 +01:00
Sebastiaan Janssen
0ba5a0ab25 Merge branch 'v8/dev' into v8/contrib 2020-01-14 08:46:43 +01:00
Shannon
094f1c2539 Merge branch 'netcore/dev' into netcore/feature/AB4234-Move-Indentity-struff-to-web 2020-01-14 12:41:58 +11:00
Shannon Deminick
2c7c556c5f Merge pull request #7425 from umbraco/netcore/feature/AB3677-remove-current-from-core 
Netcore: Removed Current (Core)
 2020-01-14 12:37:41 +11:00
Shannon
63fab6a56b adds notes 2020-01-14 11:47:31 +11:00
Shannon
d9d3e6847f Merge remote-tracking branch 'origin/v8/dev' into v8/feature/7212-segment-support 2020-01-13 21:33:26 +11:00
Shannon Deminick
eeb4f172bc Merge pull request #7212 from PerplexDaniel/feature/backoffice-segment-support-server 
Segments in Backoffice: Server code
 2020-01-13 21:31:24 +11:00
Dave Woestenborghs
eeaa5a82d4 V8/doctype tours (#6980) 2020-01-10 10:39:22 +01:00
Poornima Nayar
1cd30aae99 Merge pull request #6943 from kjac/v8/fix/protect-system-media-types 
V8: Protect "system media types" from alias changes and deletion
 2020-01-09 14:18:10 +00:00
Ronald Barendse
c38240c872 Add SetVariesBy extension methods for ContentVariation 2020-01-09 09:35:37 +01:00
Bjarne Fyrstenborg
0dfd7679e0 Request datatype by guid (#6847) 2020-01-08 19:02:16 +01:00
Bjarke Berg
29140bc7ea AB4375 - Moved ITagQuery and TagModel to Umbraco.Abstractions 2020-01-08 15:39:07 +01:00
Ronald Barendse
cae2c32172 Remove SetFlag and UnsetFlag extension methods 2020-01-07 20:32:04 +01:00
Bjarke Berg
c6c0d7df54 AB4234 - Moved stuff from core into web, that used identity. 2020-01-07 13:50:38 +01:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-01-07 09:46:42 +01:00
Daniël Knippers
24afe3f130 Changed ArgumentException to InvalidOperationException 2020-01-07 09:34:12 +01:00
Bjarke Berg
439048bc4f Merge pull request #7380 from AndyButland/feature/7371-short-string-helper 
.NET Core transition: Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection (#7371)
 2020-01-07 09:05:28 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Andy Butland
bd5b344a57 Merge branch 'netcore/dev' into feature/7371-short-string-helper 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/TypeExtensions.cs
#	src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/DataTypeFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeRepository.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
#	src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
#	src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web/Editors/CodeFileController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/CurrentUserController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MacroRenderingController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Editors/RelationTypeController.cs
#	src/Umbraco.Web/Editors/TinyMceController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/Models/Mapping/UserMapDefinition.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-12-24 09:08:47 +01:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Bjarke Berg
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +01:00
Bjarke Berg
d5527f0485 AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead 2019-12-19 10:43:34 +01:00
Bjarke Berg
6c923bc9b4 AB4227 - Moved a mix of files 2019-12-18 13:42:33 +01:00
Rob Maas
809ab6d05f Added ContentApps for Members (#6670) 2019-12-18 10:43:41 +01:00