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

5125 Commits

Author SHA1 Message Date
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
 2020-03-04 10:10:03 +01:00
Bjarke Berg
d53dd71204 Merge pull request #7750 from umbraco/netcore/feature/untangle-membership 
Netcore: Untangle membership helper and trim Web even more
 2020-03-04 08:20:25 +01:00
Bjarke Berg
bce196353e Fix view 2020-03-03 13:43:53 +01:00
cyberdot
efd8e37f34 Merge branch 'netcore/dev' into temp-7667 2020-03-03 12:05:31 +00:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Bjarke Berg
53769b42b3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/untangle-membership 2020-03-03 12:01:54 +01:00
Elitsa Marinovska
84f19e093a NetCore: Refactor internal usages of UmbracoHelper (#7744) 
* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods

* Removed UmbracoHelper from UmbracoApiControllerBase

* Removed UmbracoHelper references

* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality

* Fixed tests referencing UmbracoHelper

* Adding Media methods back

* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests

* Reintroduced some methods..

* Reintroduced some methods..

* Reintroducing last missing bits

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-03-03 11:59:17 +01:00
Bjarke Berg
81c975381f Merge branch 'netcore/dev' into netcore/feature/untangle-membership 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-03-02 13:19:38 +01:00
Bjarke Berg
07238e277b Merge branch 'netcore/dev' into netcore/feature/executable-backoffice 2020-03-02 09:07:25 +01:00
Bjarke Berg
1ea39f2762 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
#	src/Umbraco.Core/Packaging/ConflictingPackageData.cs
#	src/Umbraco.Core/Packaging/PackagesRepository.cs
#	src/Umbraco.Core/PublishedCache/PublishedMember.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
#	src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
#	src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/MediaTypeTreeController.cs
 2020-03-02 08:34:52 +01:00
Bjarke Berg
7daee53c64 Isolated more web usages - Membership and Request stuff 
- Moved a few more files
 2020-02-28 11:15:25 +01:00
Bjarke Berg
178a172be1 Merge branch 'netcore/feature/move-more-install-stuff' into netcore/feature/executable-backoffice 2020-02-27 10:58:48 +01:00
Bjarke Berg
f0dee45069 Refactored UmbracoApplication.Restart 2020-02-27 10:55:07 +01:00
Bjarke Berg
dc36fa1290 Fix issues in views 2020-02-27 10:43:09 +01:00
Bjarke Berg
c975162e14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 09:57:27 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
942bb0d585 Merge branch 'netcore/feature/move-mappings-after-httpcontext' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Abstractions/CompositionExtensions.cs
 2020-02-19 14:44:22 +01:00
Bjarke Berg
5e79585149 Introduced Umbraco.Web.UI.Backoffice 2020-02-18 08:32:06 +01:00
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
abi
a7ad464b40 Remove Empty Statements 2020-02-12 15:11:18 +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