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
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Sebastiaan Janssen
1f44b94ef6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2020-09-09 12:52:42 +02:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 12:48:28 +02:00
Niels Lyngsø
40d13bfb2f V8.7RC Show Blocks that does not have a BlockConfiguration as Unsupported Bl… (#8786) 2020-09-07 12:33:58 +02:00
Niels Lyngsø
3f99972ebb if user discards a new block it should be removed. 2020-09-07 09:20:15 +02:00
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Ronald Barendse
02fba85f73 Update config comments and fix transforms (#8808) 2020-09-04 09:36:28 +02:00
Ronald Barendse
d5933a154c Use correct woff and woff2 MIME types 2020-09-04 09:32:33 +02:00
Sebastiaan Janssen
10281cb0e6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
 2020-09-02 14:23:40 +02:00
Sebastiaan Janssen
79ac19bff8 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/edit.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
 2020-09-02 10:14:10 +02:00
Olivier Bossaer
9c33f4b2fe Fix #7672 - Image can be added to root of Media when AllowAtRoot is false (#7853) 2020-08-31 22:25:09 +02:00
Jan Skovgaard
6de24fc7f1 User property editor: Add "Remove" warning dialog (#8745) 2020-08-31 20:27:07 +02:00
Jan Skovgaard
3c1ad02126 Userpicker: Add warning overlay when the "Remove" button is hit (#8739) 2020-08-31 20:17:17 +02:00
Warren Buckley
ecfc520d44 Make the selector less specific to fix the doctype tour 
The child element no longer contains an <a> but is a <button> however no need to be that specific
 2020-08-27 10:38:27 +01:00
Jan Skovgaard
8cf999e4a1 Accessibility: Grid config datatype improvements (#8712) 2020-08-26 20:25:30 +02:00
Ronald Barendse
8a074616d3 Change grid view @Html.If to conditional statement 
(cherry picked from commit a5f4252f09)
 2020-08-26 18:24:18 +02:00
Ronald Barendse
a5f4252f09 Change grid view @Html.If to conditional statement 2020-08-26 18:23:04 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Bjarke Berg
66a0125d3f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
 2020-08-21 13:26:00 +02:00
Sebastiaan Janssen
8db0967d47 Fix merge error 2020-08-20 10:19:14 +02:00
Sebastiaan Janssen
c8da5156fa Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-08-19 13:12:13 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
9ae878a185 Hardcode verion 9 in text, and change assembly versions to 0.5.0 2020-08-17 09:34:27 +02:00
Sebastiaan Janssen
acb2c203bd Bump to v8.8.0 2020-08-13 14:41:54 +02:00
Bjarke Berg
bd1aac7b36 Fix issue with tour's next button not clickable when infinite editing bar is open 2020-08-11 14:23:29 +02:00
Bjarke Berg
dfc37a571a Fixes for Umbraco.Web.UI.csproj 2020-08-11 11:22:15 +02:00
Bjarke Berg
9432f71a63 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-11 10:00:19 +02:00
Bjarke Berg
0fe50728df Fix csproj of Umbraco.Web.UI 2020-08-11 09:50:17 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Claus
4799f73775 using label on umb-toggle instead of a separate element. 
updating localized texts to reflect what is happening.
ensure the selected value is pushed back to scope and used for the action.
 2020-08-06 15:04:18 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Warren Buckley
86508fb39a Update to default Razor snippet we use to help with Block List editor 2020-08-05 11:10:55 +01:00
Bjarke Berg
8b1bf3c16f Fix issue with tour's next button not clickable when infinite editing bar is open 2020-08-03 12:54:27 +02:00
Bjarke Berg
790a3b26bf Removed missing files from csproj 2020-08-03 11:42:45 +02:00
Niels Lyngsø
d06c1e01a7 Update da.xml 
translate to danish
 2020-08-03 11:27:32 +02:00
Bjarke Berg
5aae0c2b52 Removed folder from csproj 2020-08-03 11:15:02 +02:00
Niels Lyngsø
47203f7111 discard changes dialog 2020-07-31 14:05:07 +02:00
Bjarne Fyrstenborg
dfe8930653 Update model name in logviewer saved search (#8527) 2020-07-31 10:18:24 +02:00
Michael Latouche
6e2e2eca05 Update French translations file to V8 labels (#7379) 2020-07-30 18:12:08 +02:00
Jan Skovgaard
0e4979bd7f Convert menu actions to use umb-button-ellipsis component (#8503) 2020-07-30 17:32:50 +02:00
Mike Masey
add1a99cc4 V8: Add umb-icon directive to backoffice to begin transition from icon fonts to svgs (#5606) 2020-07-29 11:29:49 +02:00
Lars-Erik Aabech
e8bb3b01aa Better crop mechanism for the grid image editor (#8023) 2020-07-24 16:47:09 +02:00
Bjarne Fyrstenborg
41d1e33fc4 Add user picker property editor (#7613) 2020-07-23 16:08:24 +02:00
Shannon
06afab9893 Adds some warning logs for when data is removed 2020-07-23 23:04:11 +10:00
BatJan
3441200a7f Convert a to button and fix some texts and make them more specific in a non visual context 2020-07-22 20:22:33 +02:00
Rachel Breeze
0a01601523 v8: Improvements to accessibility of translations section (#8383) 2020-07-22 19:08:18 +02:00
Elitsa Marinovska
717d8e6156 Migrating as many of the templates from Umbraco.Web.UI\Umbraco\PartialViewMacros\Templates 2020-07-21 08:12:29 +02:00