yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,282 Commits 4 Branches 7 Tags
38c41fa0bdbc33caed1d82c9bbb050e118ed4cb4
Commit Graph

33282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
397b25f9ae Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-24 19:38:44 +01:00
Bjarke Berg
9cca16d31b Rollback of changes not related to this issue 2020-03-24 19:37:04 +01:00
Bjarke Berg
e8095b1a36 Merge remote-tracking branch 'origin/netcore/feature/ab5820-webprofiler-aspnetcore' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
#	src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
 2020-03-24 18:57:29 +01:00
Bjarke Berg
9339e1d999 AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:56:45 +01:00
Joe Delly
2ec0861051 Fix for exception throw when validating URLs (#7701) 2020-03-24 18:35:11 +01:00
Bjarke Berg
d577452aff AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:18:25 +01:00
Nathan Woulfe
ffef6ed2a1 7713 - changing CSS directory breaks RTE (#7726) 2020-03-24 18:04:38 +01:00
Matt Barlow
7c841eb6ac 7728 - show elipsis only when > length 
Fixed the elipsis issue, only adds an elipisis if the text length exceeds the length that is being truncated too.
 2020-03-24 18:01:34 +01:00
Matthew Wise
994c379a94 Removed duplications of tree routing 2020-03-24 17:53:03 +01:00
Nathan Woulfe
b082d40921 adds utility.js as facade to generic javascript utility functio… (#7738) 2020-03-24 17:48:14 +01:00
Anders Bjerner
b6a34ebac7 Implemented fix for #7754 2020-03-24 17:45:21 +01:00
Bjarne Fyrstenborg
54f75b9393 No more TypedContentAtRoot (#7763) 2020-03-24 17:41:26 +01:00
Elitsa Marinovska
b23c508c54 Using Smidge inline bundle creation in view 2020-03-24 17:35:55 +01:00
Elitsa Marinovska
ccfaebb09f More of the Smidge initial implementation. Adding TODOs for next steps 2020-03-24 17:34:34 +01:00
Sebastiaan Janssen
5d7683e5fa Merge branch 'v8/dev' into v8/contrib 2020-03-24 17:34:07 +01:00
Sebastiaan Janssen
df04ffa68d Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2020-03-24 17:30:10 +01:00
Alexander Karlsson
e8d63d9a7a #7780 Show all filters that is more then 0 hits 2020-03-24 17:08:01 +01:00
Arkadiusz Biel
3640ed259d GetAllIds for Roles (#7806) 2020-03-24 15:15:52 +01:00
Erik-Jan Westendorp
0a79e28205 #7803 Add EditorGroupAlias and WriterGroupAlias to Constants cl… (#7804) 2020-03-24 14:03:51 +01:00
dependabot[bot]
99152ffef3 Bump acorn from 5.7.3 to 5.7.4 in /src/Umbraco.Web.UI.Client 
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-24 14:01:11 +01:00
Andy Butland
519fd22cea Changed hard-coded processed images URLs in back-office to use configured image URL generation. 2020-03-24 12:29:16 +01:00
Andy Butland
e66c92d032 Added controller method to ImagesController and client-side method to mediahelper to retrieve URL for processed image. 2020-03-24 12:19:04 +01:00
Andy Butland
c16965319a Amended processed image URL building to use checks for empty as well as null, and refactored null checks to use HasValue. 2020-03-24 12:17:41 +01:00
Elitsa Marinovska
85730eadb0 Setting up Smidge 2020-03-24 10:51:53 +01:00
Andy Butland
b67c3dfa04 Moved IImageUrlGenerator and implementation into more appropriate enamespace 2020-03-24 09:37:46 +01:00
Shannon
d0a204b984 Cleans up some unused code, fixes a merge issue causing duplicate runtimes to be created, register essential does what it's supposed to do, don't mix things with the webruntime. 2020-03-24 14:48:32 +11:00
Shannon
59f0edc074 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore-db 
# Conflicts:
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
 2020-03-24 14:47:10 +11:00
Shannon Deminick
bcc8dff862 Merge pull request #7811 from umbraco/netcore/feature/booting-netcore 
Puts in place the code to 'boot' Umbraco Core in netcore
 2020-03-24 12:12:24 +11:00
Shannon
2f8a85abe5 resolves remaining PR comments 2020-03-24 12:11:46 +11:00
Shannon
139cd3935f oops 2020-03-24 12:00:48 +11:00
Shannon
2bbdb699f2 reduces code duplication 2020-03-24 11:59:42 +11:00
Shannon
919d418920 Gets the DB installing in integration tests, changes integratino tests to use Generic Host builder 2020-03-24 11:53:56 +11:00
Elitsa Marinovska
94a0f62525 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 2020-03-23 14:32:28 +01:00
Bjarke Berg
8986783cbc Parse connection string provider 2020-03-23 14:31:21 +01:00
Bjarke Berg
a3930b1b70 Merge branch 'netcore/dev' into netcore/feature/unit-test-project 2020-03-23 13:56:18 +01:00
Chris Oliver
3edfc42623 Collapse navigation items based on container size 
- Previously a maximum of 8 items were shown.
- This change calculates the width of each item and displays as many as possible in the container.
- Any overflowing items will be moved to the ... menu
 2020-03-23 13:48:40 +01:00
Olivier Bossaer
ff2027df07 Fixes #7798 : Invalid implementation of IEnumerable in Content Cache 2020-03-23 13:27:04 +01:00
Bjarke Berg
919271b2c6 Post merge fix 2020-03-23 13:03:02 +01:00
Elitsa Marinovska
5293a3c1b5 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5490-abstract-clientdependency 2020-03-23 12:50:16 +01:00
Bjarke Berg
73a1058dd1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/Property.cs
 2020-03-23 12:48:56 +01:00
Elitsa Marinovska
b833279534 Left out changes 2020-03-23 12:46:19 +01:00
Shannon
679b88a2fb more asserts 2020-03-23 17:35:04 +11:00
Shannon
5761381bc3 adds notes 2020-03-23 17:25:45 +11:00
Shannon
7900179abd oops fix build 2020-03-23 17:16:33 +11:00
Shannon
6013d856b7 Changes back TestHelperBase, we'll just allocate new configs each time. 2020-03-23 17:15:32 +11:00
Shannon Deminick
51d7ce0dc6 Merge pull request #7782 from PerplexDaniel/v8/feature/variationcontext-get-segment 
Added GetSegment() method to VariationContext and uses it when conten…
 2020-03-23 16:55:40 +11:00
Shannon
427c44468f Changes methods to properties since we don't return new instances each time. 2020-03-23 16:41:39 +11:00
Shannon
299e9eb209 fixing tests and merges 2020-03-23 16:39:27 +11:00
Shannon
1658fced23 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore 
# Conflicts:
#	src/Umbraco.Core/IO/IOHelper.cs
#	src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
#	src/Umbraco.Tests.Common/TestHelperBase.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Program.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2020-03-23 15:50:01 +11:00
Shannon Deminick
91ae2d63da Merge pull request #7822 from umbraco/netcore/feature/ab3671-webruntime-netstandard 
NetCore: Make WebRuntime netstandard compatible
 2020-03-23 15:09:02 +11:00