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

5300 Commits

Author SHA1 Message Date
Elitsa Marinovska
4b7d823aca Injecting the abstraction whenever necessary 2020-03-17 10:28:03 +01:00
Bjarke Berg
ea15fdb14e Avoid usage of IOHelper in GlobalSettings 2020-03-13 10:00:03 +01:00
Warren Buckley
2d3388d6d3 Update dependency for 8.5.5 2020-03-12 15:52:23 +01:00
Bjarke Berg
c486444eda Cleaned up config for Content settings 2020-03-12 15:30:22 +01:00
Bjarke Berg
cb0994a929 Cleaned up config for Security settings 2020-03-12 14:36:25 +01:00
Bjarke Berg
e07c9abd58 Updated js code in UI project 2020-03-11 12:54:33 +01:00
Niels Lyngsø
d4dae19888 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
#	src/Umbraco.Web.UI.Client/src/less/sections.less
 2020-03-11 12:00:19 +01:00
Bjarke Berg
9d6762fb6a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
 2020-03-10 08:25:43 +01:00
Warren Buckley
69483d03b6 Set version to 8.6.0 
.\build SetUmbracoVersion 8.6.0
 2020-03-09 09:57:22 +00:00
Andy Butland
8e3967c596 Merge branch 'netcore/dev' into netcore/77007-replace-no-nodes 
# Conflicts:
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Constants-Web.cs
 2020-03-06 07:28:13 +01:00
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
Andy Butland
e6a55a215a Replaced nonodes.aspx with MVC controller and view, with configurable view location. 2020-02-29 14:26:35 +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
Matthew-Wise
4dc5b02b89 Changed showPage to Save and publish updated button style to link (#7649) 
* Changed showPage to Save and publish updated button style to link

* Change language key from showPage to saveAndPreview
 2020-02-26 13:44:57 +00: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
Niels Lyngsø
27b239cc08 making variant dialogs up to date with Segments. 2020-02-19 17:25:08 +01:00
Niels Lyngsø
602ee33334 use "and" instead of & 2020-02-19 15:35:46 +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
emma burstow
2a277eec6b Merge branch 'v8/contrib' into pr/7231 2020-02-19 13:35:22 +00:00
Niels Lyngsø
490ce0808a Save & publish dialog change for a simpler experience accommodating segments 2020-02-19 13:28:46 +01:00
Niels Lyngsø
2cd50822ea adjustments of Save and publish dialog 2020-02-19 09:35:36 +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
Warren Buckley
9c428b7f01 Bump version to 8.5.4 2020-02-12 11:55:51 +00: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
Niels Lyngsø
87b9642d1a Merge branch 'v8/feature/AB4550-segments-clientcode' into v8/feature/AB4550-segments-ui-variant-picker 2020-02-10 11:34:29 +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
Niels Lyngsø
555be8dd0a first part of enabling allow segments 2020-02-06 12:47:50 +01:00