yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,756 Commits 4 Branches 7 Tags
849e7179f75537bee08b595e9ebc1809e2f35aec
Commit Graph

11286 Commits

Author SHA1 Message Date
Bjarke Berg
b729c44505 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	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/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
 2020-10-02 16:43:23 +02:00
Bjarke Berg
2b7980fcb9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Services/IIconService.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Services/IconService.cs
 2020-10-02 16:38:12 +02:00
Warren Buckley
c1b0f6977e Merge pull request #8974 from umbraco/v8/feature/use-block-edit-for-labelblock 
use block.edit()
 2020-10-01 11:11:54 +01:00
Bjarke Berg
4181e2639c Clean up - Only add signalr once as dependency 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-01 07:13:16 +02:00
Mole
a69d705d34 Clean 2020-09-30 10:21:21 +02:00
Mole
ab1f41edfb Configure logging for signalR 2020-09-30 10:05:37 +02:00
Mole
8653496fd8 Move MapHub to BackOfficeAreaRoutes and get hub path from ServerVariables 2020-09-30 10:02:28 +02:00
Mole
b6b41cac5b Only create one instance of HubConnection 2020-09-30 09:01:08 +02:00
Mole
2175c8e4a7 Register PreviewHub in composer 
It actually updates now \o/
 2020-09-29 15:25:27 +02:00
Mole
ccab3d2288 Make success log notification appear as before 2020-09-29 14:02:27 +02:00
Mole
6ced0de2c4 Fix gulp dependencies 2020-09-29 13:32:08 +02:00
Nikolaj
2d760a7744 Update dependencies in gulp 2020-09-29 13:18:12 +02:00
Mole
e9cf22735d Use HubConnectionBuilder in preview.controller 2020-09-29 13:00:39 +02:00
Mole
078ab74a8f Update signalR to core version 2020-09-29 12:49:59 +02:00
Sebastiaan Janssen
9ac600aeff Merge branch 'v8/dev' into v8/contrib 2020-09-28 20:35:26 +02:00
Niels Lyngsø
5d9389b37c adjust default size of umb-button-ellipsis and its apperance in umb-tree 2020-09-28 19:53:23 +02:00
Niels Lyngsø
956c81ff32 8.8 Revert icon styling, to ensure backwards compatibility (#8941) 2020-09-28 19:44:58 +02:00
Niels Lyngsø
ebe3c26cb7 use block.edit() 2020-09-28 14:13:43 +02:00
Warren Buckley
1868c215d9 Merge pull request #8850 from umbraco/v8/feature/umb-property-info-button 
Review Feature: umb-property-info-button
 2020-09-28 11:49:24 +01:00
Sebastiaan Janssen
f29c5f0e3b Merge branch 'v8/dev' into v8/contrib 2020-09-23 11:18:43 +02:00
Bjarne Fyrstenborg
59784a1551 Update noUiSlider to v14.6.2 2020-09-23 14:18:16 +10:00
Bjarke Berg
a28168667b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 13:28:03 +02:00
Bjarke Berg
bd534d340e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/IIconService.cs
#	src/Umbraco.Infrastructure/Services/Implement/IconService.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Web/Editors/IconController.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
 2020-09-22 12:38:36 +02:00
Bjarke Berg
164fa24ef3 #8919 - Fix issue with wrong casing of variable name 2020-09-22 10:04:55 +02:00
Niels Lyngsø
d3db24e705 Merge remote-tracking branch 'origin/v8/8.8' into v8/bug/8919-cache-icons-used-in-login-screen 2020-09-17 15:00:02 +02:00
Niels Lyngsø
0506c8c555 defineIcon method 2020-09-17 14:59:12 +02:00
Lars-Erik Aabech
6d15a2fce3 Eliminates error/no-preview when grid media picker have no crop set (#8620) 
(cherry picked from commit deb03e4d82)
 2020-09-17 11:35:17 +02:00
Lars-Erik Aabech
deb03e4d82 Eliminates error/no-preview when grid media picker have no crop set (#8620) 2020-09-17 11:32:52 +02:00
Warren Buckley
5a37854dd5 Merge pull request #7599 from umbraco/v8/feature/ui-media-create-button-style 
UI: corrected button style to match new style
(cherry picked from commit 2e055ca146)
 2020-09-17 09:18:55 +02:00
Niels Lyngsø
1fc8e826f6 Merge remote-tracking branch 'origin/v8/contrib' into v8/feature/umb-property-info-button 2020-09-16 15:08:27 +02:00
Niels Lyngsø
9882edeca0 added translation to demo implementation 2020-09-16 14:54:25 +02:00
Bjarke Berg
7d8c9ee4c9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-09-15 09:35:57 +02:00
Bjarke Berg
c9243d9d61 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-09-15 09:35:05 +02:00
Niels Lyngsø
4a8703d5a3 no message 2020-09-14 11:56:50 +02:00
Bjarne Fyrstenborg
600ae926d4 Remove local function to create guid and use String.CreateGuid() extension function instead (#8886) 2020-09-13 22:21:30 +02:00
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
Warren Buckley
a7a560aa26 Merge pull request #8809 from umbraco/v8/bugfix/8801-resolvers-should-be-registred-for-specific-clipboard-entry-types 
V8.7RC: Clipboard resolvers should target specific entry types
 2020-09-07 14:43:36 +01: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
Bjarne Fyrstenborg
86d105dcf3 Checkboxlist and radiobuttonlist validation (#8833) 
(cherry picked from commit 4782560f2f)
 2020-09-07 10:47:36 +02:00
Bjarne Fyrstenborg
4782560f2f Checkboxlist and radiobuttonlist validation (#8833) 2020-09-07 10:46:03 +02:00
Niels Lyngsø
3f99972ebb if user discards a new block it should be removed. 2020-09-07 09:20:15 +02:00
Bjarke Berg
13ad1e0a88 remove hardcoded version number 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-04 20:12:49 +02:00
Sebastiaan Janssen
fa4809a288 Merge pull request #8783 from umbraco/v8/bugfix/8723-do-not-always-hide-menu 
Should not call hideDialog
 2020-09-04 13:49:13 +02:00
Sebastiaan Janssen
f19c3728fa Merge pull request #8744 from umbraco/v8/bugfix/block-list-custom-view-validation-error-indication 
V8.7RC: Moved validation indication one element up.
 2020-09-04 13:46:10 +02:00
Sebastiaan Janssen
e7ac6a614a Switch from the Chrome runner to JSDom (#8800) 
(cherry picked from commit 4313463a94)
 2020-09-04 13:39:50 +02:00
Niels Lyngsø
b56b15437d Only request getCount if user has access to settings 2020-09-04 13:30:14 +02:00
Niels Lyngsø
330c113da2 append property editor api methods to the block object for better developer experience. 2020-09-04 13:24:36 +02:00