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

10286 Commits

Author SHA1 Message Date
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
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
Bjarke Berg
a3930b1b70 Merge branch 'netcore/dev' into netcore/feature/unit-test-project 2020-03-23 13:56:18 +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
Sebastiaan Janssen
67168068f6 Merge branch 'v8/contrib' into pr/7449 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2020-02-25 22:12:37 +01:00
Kenn Jacobsen
7d0c5508da Rollback breaks for non-string property values 2020-02-25 21:54:34 +01:00
Kenn Jacobsen
50ab5ce79b Open rollback in a medium sized panel 2020-02-25 21:53:41 +01:00
Kenn Jacobsen
044dc4eb98 Only show culture for content links if there is more than one culture 2020-02-25 21:51:31 +01:00
Kenn Jacobsen
ea29eb993c Align "Field is mandatory" label with the actual toggle 2020-02-25 21:50:30 +01:00
Kenn Jacobsen
5e155a871c Fix the create dialog on empty installs 2020-02-25 21:42:37 +01:00
Kenn Jacobsen
f4cd1c2f0c Fix JS errors for Nested Content in single mode 2020-02-25 21:28:40 +01:00
Warren Buckley
aa8e2b0859 Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a)
 2020-02-25 13:08:22 +00:00
Warren Buckley
4acddb288a Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
 2020-02-25 13:07:34 +00:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +01:00
Warren Buckley
a65bf08f1a Merge pull request #7630 from kjac/v8/fix/nested-content-single-mode-add-more-than-one 
V8: Nested Content can't add multiple items
 2020-02-25 09:43:56 +00:00
Kenn Jacobsen
69b3bc6fc7 V8: Remove create option in listviews for deleted content (#7655) 2020-02-24 18:46:36 +00:00
Kenn Jacobsen
23f8c3e474 V8: Correct cursor for list view search icon (#7656) 2020-02-24 18:28:11 +00:00
Warren Buckley
4275401c4b Merge pull request #7654 from kjac/v8/fix/recycle-bin-without-mculture 
V8: Ensure that the recycle bin doesn't delete content at root
 2020-02-24 15:50:13 +00:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
 2020-02-24 15:11:58 +00:00
Kenn Jacobsen
2b103f539d Fix overlays in fullscreen RTE (#7697) 2020-02-24 14:06:18 +00:00
Jeavon
5efeb53805 Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700) 2020-02-24 11:11:33 +00:00
Nathan Woulfe
51481bbe3a Update editor.service.js (#7703) 
fix ngdoc description for templateEditor fn
 2020-02-24 10:35:46 +00:00
Niels Lyngsø
fcc079111d Slightly brigther disable state 2020-02-22 20:01:16 +01:00
Nathan Woulfe
d65b8f14ba add pointer-events:none on disabled checkbox/radio 2020-02-22 12:02:50 +01:00
Kenn Jacobsen
634741e35b Make sure mculture is set after logout and login 2020-02-20 19:56:33 +01:00
Bjarke Berg
e6c315ff69 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Editors/UpdateCheckController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:06:37 +01:00