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

5012 Commits

Author SHA1 Message Date
Bjarke Berg
09b480919b Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
 2020-01-07 07:35:34 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Andy Butland
32e46b0f0c Added user and member password configuration to release config. 2019-12-24 08:05:33 +01:00
Andy Butland
0670caee15 Populated user and member password configuration from settings file. 2019-12-23 14:35:39 +01:00
Sebastiaan Janssen
c1bffefd23 Merge branch 'v8/dev' into v8/contrib 2019-12-20 11:55:36 +01:00
Warren Buckley
ed0aa7f14a Use DetectIsJson string extension as opposed to a horrible try/catch 2019-12-20 09:55:03 +00:00
Niels Swimberghe
e578ca1b0f Add KeepAlive settings to resolve #7116 (#7164) 2019-12-20 08:14:42 +01:00
Warren Buckley
1fc2c89ea6 Updates the HTML Razor Partial View for grid cell items that use Embed 
It has been recently updated in 8.2.0 that the Value stored is a JSON object containing width, height & the raw HTML returned by the oEmbed

Fixes #7178
 2019-12-19 16:01:55 +00:00
Warren Buckley
fa2bbcc358 V8: Add in Recycle Bin context message (#7341) 
* Add a message bar to give context that this node/content item is in the trash/recycle bin

* Update umb-variant-content.html

* Update en.xml

* Update en_us.xml
 2019-12-19 09:38:44 +01:00
Sebastiaan Janssen
8b225b8e58 Merge branch 'v8/dev' into v8/contrib 2019-12-19 09:18:02 +01:00
Dennis Adolfi
a835aa0674 v8: Updated search component to get translated placeholder "Search.." and "Clear" text (#7122) 
* Added translation for clear with marker so I can see if it loads correcly. Installing Umbraco locally to try it out.

* Added Clear translation to en.xml, en-us.xml and sv.xml.

* befin translation search placeholder. Not working for some reason, investiagte.

* Inject localizationService to localize placeholder. For some reason i get 503 service unavabile when I try to build.ps1. Will have to look more into this late, saving my work.

* merge conflicts

* 2 vs 4 spaces caused massive diff. Fixed my local copy to same space so now it should look better.

* * updated after PR review. Using localize element attribute instead of adding dependency to the localizationService. Also added dansih translation.

* Remove whitespace noise
 2019-12-19 08:25:42 +01:00
Rachel Breeze
578a725d7c V8: Accessibility Changes For umbEditorHeader Directive (settings section) (#6986) 
* Improved accessibility of the data type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Improved accessibility of the macro edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Improved accessibility of the relation type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Added to do note for log viewer
 2019-12-18 14:37:34 +01:00
Niels Lyngsø
5939d02e49 remove line break 2019-12-17 16:19:48 +01:00
Niels Lyngsø
746bcb3571 updated badge animation and position to be center aligned. 2019-12-17 15:42:20 +01:00
Niels Lyngsø
9640f05582 updated previewBadge with option to open in PreviewMode in BackOffice and with new styling 2019-12-17 13:50:35 +01:00
Niels Lyngsø
e215d19f96 only show languages if we have any + select default if none is selected + right align dropdown menu 2019-12-16 16:31:04 +01:00
Niels Lyngsø
526b1e8b82 changed svg to icon 2019-12-16 15:05:58 +01:00
Warren Buckley
b78d8fa3e1 Merge pull request #6795 from umbraco/v8/feature/mb-embed 
V8: Embed models builder
 2019-12-16 11:42:01 +00:00
Bjarke Berg
76e1f30594 Fixed broken view 2019-12-10 15:01:11 +01:00
Bjarke Berg
aa15f89275 Merge remote-tracking branch 'origin/v8/feature/media-tracking' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Models/IDataValueEditor.cs
#	src/Umbraco.Abstractions/Models/RelationType.cs
#	src/Umbraco.Core/Contants-UdiEntityType.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Tests/Models/RelationTests.cs
#	src/Umbraco.Tests/Models/RelationTypeTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-10 14:44:42 +01:00
Niels Lyngsø
86c6fd5873 dropdown menus for preview 2019-12-10 14:07:09 +01:00
Niels Lyngsø
6c0cb723c6 new preview UI prototype 2019-12-10 09:40:41 +01:00
Warren Buckley
ba82e51c72 Bumped to 8.5.0 
powershell .\build setumbracoversion 8.5.0
 2019-12-06 09:48:35 +00:00
mikkelhm
7c5a2dd6f1 Close unclosed key element in italian language file 2019-12-05 08:35:49 +01:00
Bjarke Berg
1da4429177 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
#	src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
#	src/Umbraco.Abstractions/Exceptions/InvalidCompositionException.cs
#	src/Umbraco.Abstractions/IO/MediaFileSystem.cs
#	src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
#	src/Umbraco.Abstractions/Migrations/DataLossException.cs
#	src/Umbraco.Abstractions/Models/Entities/EntitySlim.cs
#	src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
#	src/Umbraco.Abstractions/Xml/XmlHelper.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
#	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
 2019-12-02 13:51:07 +01:00
Niels Lyngsø
4b8ea94991 Property-Action for Remove All Entries in Nested Content (#7036) 
* Property-Action for remove all entries from Nested Content
* Add "delete all items" confirmation and rephrase action link a bit
* Enforce "delete" confirmation type in overlayService.confirmDelete
* rename to controller for easier to solve merge conflicts
* update removeAllEntriesAction.isDisabled when content changes
* minor correction
 2019-11-26 13:59:37 +01:00
Shannon
1136e15a27 kill user membership provider, adds some passwords api abstractions, moves membership provider logic out of Core/services, removes membership scenario and other membership code we don't want anymore. 2019-11-25 21:20:00 +11:00
Bjarke Berg
4d5d94d3ed 7173 - Refactored to inject IUmbracoVersion instead of using Current. 2019-11-20 10:50:15 +01:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Bjarke Berg
a49b313080 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2019-11-19 11:05:32 +01:00
Shannon
31f51516d2 removes old config transforms for v7 -> v8 no longer needed 2019-11-19 11:53:05 +11:00
mikkelhm
6faa5d79d3 Close unclosed key element in italian language file 2019-11-18 22:17:39 +01:00
Shannon
4338a8f32d Merge branch 'netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-18 20:23:31 +11:00
Shannon
cd3a97ce75 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Abstractions/Constants-Conventions.cs
 2019-11-18 19:58:42 +11:00
Bjarke Berg
47a0326e9c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-15 11:43:05 +01:00
Bjarke Berg
a97e131891 Bump version o 8.6 (8.5 reserved for MB release) 2019-11-14 14:00:49 +01:00
Bjarke Berg
c0dc545c27 Fix for csproj 2019-11-14 13:54:04 +01:00
Bjarke Berg
7c72fb57f2 Merge remote-tracking branch 'origin/v8/8.3' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
 2019-11-14 13:40:32 +01:00
Bjarke Berg
ba73ad5792 Merge remote-tracking branch 'skttl/grid-editor-name-templates' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI/config/grid.editors.config.js
 2019-11-14 13:08:05 +01:00
Shannon
89f5cec832 Fixes System.ComponentModel.Annotations to keep working with aspnet framework 2019-11-14 17:00:21 +11:00
Shannon Deminick
d0f534e2f4 Merge pull request #7120 from umbraco/netcore/feature/AB3649-move-manifest-stuff 
Netcore: Move manifest code
 2019-11-14 12:10:25 +11:00
Bjarke Berg
2e200779f9 Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-13 14:20:21 +01:00
Bjarke Berg
c9a99f52aa Can't have the path info on IOHelper, because that leads to a cycle between config and IOHelper. Now you need to go directly to config, if you need a path 2019-11-13 14:15:50 +01:00
Bjarke Berg
9889967b83 Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Abstractions/Configuration/GlobalSettingsExtensions.cs
#	src/Umbraco.Core/ConfigsExtensions.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
 2019-11-13 12:38:56 +01:00
Bjarke Berg
683c0da468 Moved stuff from SystemDirectories into constants and IOHelper to avoid a circular dependency 2019-11-13 11:56:32 +01:00
Bjarke Berg
6b0f7ce038 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-Conventions.cs
 2019-11-13 08:39:13 +01:00
Bjarke Berg
424260ac2b Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Core/ConfigsExtensions.cs
 2019-11-12 15:32:45 +01:00
Bjarke Berg
42904d63aa Fixed views 2019-11-12 15:32:03 +01:00
Bjarke Berg
6d18b3f363 Merge branch 'netcore/feature/AB3649-move-manifest-stuff' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 2019-11-12 14:11:08 +01:00