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

10308 Commits

Author SHA1 Message Date
Bjarke Berg
b1d214a13d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
 2020-04-01 15:52:23 +02:00
Bjarke Berg
e3ac778fc9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
#	src/Umbraco.Web/Macros/MacroRenderer.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
 2020-04-01 12:44:53 +02:00
Bjarke Berg
c75c86ab27 AB#5822 Clean up 2020-03-31 16:28:13 +02:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
12a957e9b6 AB#5820 - Copy client files into both netcore and framework executables 2020-03-31 12:59:10 +02:00
Andy Butland
75b216bca5 Removed registerFileResolver methods on image cropper and file upload property editors. 2020-03-30 14:30:50 +02:00
Andy Butland
93fd2eb954 Fixed creation of image processing options in grid media controller. 2020-03-28 14:11:24 +01:00
Andy Butland
f48a4b0c72 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 2020-03-27 21:20:08 +01:00
Bjarke Berg
44e9df949d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Property.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
 2020-03-26 19:22:09 +01:00
Søren Gregersen
a0e5b83914 Add document to downloadFile-method 
Simple copy/paste to document a useful method
 2020-03-26 11:48:01 +01:00
Andy Butland
30567d34d5 Merge branch 'netcore/dev' into feature/7540-use-image-url-generator-back-office 
# Conflicts:
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-03-26 10:53:24 +01:00
Bjarne Fyrstenborg
972acc6718 Installer adjustments (#7592) 2020-03-26 08:39:38 +01:00
Sebastiaan Janssen
935690b727 Bump caniuse-lite dependency 2020-03-25 18:09:03 +01:00
Chris Oliver
17d91da8d1 Remove button border radius when used in a button group (#7834) 2020-03-25 17:29:42 +01:00
Nathan Woulfe
ffef6ed2a1 7713 - changing CSS directory breaks RTE (#7726) 2020-03-24 18:04:38 +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
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
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
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
Bjarke Berg
8c8a9764cd Post merge + Added new SmtpSettingsBuilder 2020-03-18 07:42:35 +01:00
Bjarke Berg
3e54d96f77 Bugfix 2020-03-18 06:36:52 +01:00
Bjarke Berg
c2805a5067 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/aspnetcore-config 
# Conflicts:
#	src/Umbraco.Configuration/ConfigsFactory.cs
#	src/Umbraco.Core/Configuration/ConfigsExtensions.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
 2020-03-17 18:33:10 +01:00
Bjarke Berg
1457e98554 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-03-17 14:11:39 +01:00
Bjarke Berg
51879c0b80 Implemented config for asp.net core 2020-03-16 14:02:08 +01:00
Bjarke Berg
f446e52d8f Cleaned up condig for Logging and Tours 2020-03-12 08:24:02 +01:00
Niels Lyngsø
007fe8d894 7434 do not use umb outline for select (#7788) 2020-03-11 11:18:53 +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
Kenn Jacobsen
4ad73dc183 Fix completely broken(tm) media pickers 2020-03-04 16:27:28 +01:00
Warren Buckley
7bfeae7329 Merge pull request #7745 from kjac/v8/fix/media-picker-upload-rte 
V8: Fix broken "upload and insert media" in RTE
 2020-03-04 10:04:00 +01:00
Poornima Nayar
fd47c3300c Semantic fixes grid pre values (#7748) 
* Create Content Blueprints - Semantic fixes

* Grid Prevalues Screen -Semantic changes

* reverted a change I accidentally made
 2020-03-03 23:02:14 +01:00
Poornima Nayar
ffb5265f35 Create Content Blueprints - Semantic fixes (#7747) 2020-03-03 22:40:45 +01:00
Niels Lyngsø
8db6291c5f Adding more fine colors for UI (#7535) 
* adding colors: pinkExtraLight + gray-12 + @gray-13

* convert to hex color code

* adjusted color slightly

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
 2020-03-03 21:46:00 +01:00
Kenn Jacobsen
55bfa57525 Fix broken "upload and insert media" in RTE 2020-03-02 21:57:59 +01:00
Kenn Jacobsen
9374f61d13 Make media picker open in a medium sized overlay 2020-03-02 08:49:31 +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
Poornima Nayar
867232531c Create Content Blueprints accessibility improvements (#7020) 
* Create Content Blueprints - Disallow element types and some accessibility improvements

* re-enabled element types for content blueprint
 2020-02-29 22:36:56 +01:00
Poornima Nayar
2853448963 Improve accessibility of grid prevalues screen (#6949) 
* WIP Improve accessibility of grid prevalues screen

* Clean up of the view, improve accessibility and add localization fallbacks

* forgot to commit the stylesheet

* formatting fixes
 2020-02-29 21:50:50 +01:00
Poornima Nayar
0f540bc74d RTE config tool bar options are messed up 2020-02-29 12:09:17 +01:00
Poornima Nayar
793119b0ec Merge pull request #7132 from kjac/v8/fix/nested-content-copy-action-console-error 
V8: Fix JS error when editing document types with Nested Content properties
 2020-02-26 16:54:36 +00:00
Poornima Nayar
a43fbaee82 Merge pull request #7325 from kjac/v8/fix/treepicker-conditionally-load-languages 
V8: Don't load languages in treepicker unless they're needed
 2020-02-26 16:08:31 +00: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
Poornima Nayar
e36df809c0 Merge pull request #7140 from kjac/v8/fix/media-picker-logout-login 
V8: Make sure the media picker can survive a logout and subsequent login
 2020-02-25 22:26:18 +00:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00