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

11565 Commits

Author SHA1 Message Date
Bjarke Berg
7dbb2dbf9a Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
 2021-01-04 12:10:56 +01:00
Bjarke Berg
97cdfc302c Merge pull request #9485 from umbraco/v8/feature/update-cypress 
Update cypress
 2020-12-18 15:42:06 +01:00
Bjarke Berg
3f0f5c1449 Fixed tests and update testhelper 2020-12-18 12:23:44 +01:00
Bjarke Berg
0151c435f1 Netcore: Package support for media + media types (#9547) 
* Add support for media when installing a package

* clean up

* Fix tests

* Add support for media when installing a package

* clean up

* Fix tests

* moved tests + test data

* Migrated package tests + resources

* Fix issue with media picker on package page, was empty after save.

* Added missing files

* Fix casing issue of resources

* Added test for media

* Fix tests for linux

* Fix test

* Fix issue with move media..

* Fix issue with adding files to packages

* Add MediaType permissions.

* Fix test

* Fix test

* Retry flaky tests, and added TODOs to fix those

* new attempt to fix test

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-12-16 22:26:47 +01:00
Bjarke Berg
5119e8da9c Merge pull request #9515 from umbraco/netcore/feature/remove-overrideauthorization-attribute 
NetCore: Get rid of OverrideAuthorizationAttribute
 2020-12-16 14:49:13 +01:00
Sebastiaan Janssen
03c6227bfe Merge branch 'v8/8.9' into v8/8.10 2020-12-15 14:26:44 +01:00
Matt Darby
015882daa2 Remove type as it defaults to button 
(cherry picked from commit bc2faefb18)
 2020-12-15 14:25:50 +01:00
Matt Darby
7b32aeb127 Change defaultButton type to "button" 
(cherry picked from commit 7ddb52a34f)
 2020-12-15 14:25:41 +01:00
Bjarke Berg
1e09d0b063 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.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
 2020-12-14 22:16:21 +01:00
Sebastiaan Janssen
58c6e655b3 Merge branch 'v8/8.8' into v8/8.9 2020-12-14 15:07:38 +01:00
Sebastiaan Janssen
d5d7d31c08 Merge branch 'v8/8.7' into v8/8.8 2020-12-14 15:06:51 +01:00
Niels Lyngsø
734d33fe1c change dialog 2020-12-14 11:14:12 +01:00
Elitsa Marinovska
54d1e9d5e0 Removing AllowsCultureVariation from ContentController, so we can get rid of OverrideAuthorization attribute 2020-12-08 15:36:37 +01:00
Bjarke Berg
5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	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
 2020-12-07 12:31:26 +01:00
Shannon
9e6baf7b7f reverts js changes to continue to support multiple destinations but with the fix of returning the task instance from within MoveViewsAndRegenerateJS 2020-12-03 18:52:28 +11:00
Shannon
0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
 2020-12-02 13:14:47 +11:00
Bjarke Berg
85c01d9905 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.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.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
 2020-12-01 11:34:13 +01:00
Bjarke Berg
739194d71f Post merge - Fix for acceptance tests 2020-12-01 11:02:11 +01:00
Shannon
927335149d try fixing watch task 2020-12-01 15:02:28 +11:00
Shannon
47b4a4d234 FIxes authz on some controllers, fixes js var paths for login providers, simplifies gulp so we aren't building 2x. 2020-12-01 00:19:08 +11:00
Warren Buckley
39d66bae47 Merge pull request #8849 from umbraco/v8/feature/property-label-on-top 
Feature: Property label on top
 2020-11-30 11:55:55 +00:00
Bjarke Berg
13374a8654 post merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-30 11:57:00 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
 2020-11-30 11:24:24 +01:00
Niels Lyngsø
855bef8c59 remove this class, should not have been added here. 2020-11-30 09:56:01 +01:00
Warren Buckley
eeae4afe0b Merge remote-tracking branch 'origin/v8/dev' into v8/feature/property-label-on-top 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-11-27 15:34:53 +00:00
Sebastiaan Janssen
862a7fdce6 Merge branch 'v8/contrib' into v8/dev 2020-11-27 14:04:55 +01:00
Matt Brailsford
a6f5e48f43 Introduce content app helper (#9425) 2020-11-27 14:02:19 +01:00
Bjarke Berg
d6357e8fde Revert "Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working"" 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-27 13:34:32 +01:00
Bjarke Berg
1833bfa1a9 Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working" 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-27 13:17:34 +01:00
Warren Buckley
7d3878842a Merge pull request #7560 from umbraco/v8/feature/ensure-umb-editor-is-within-viewport 
keep umb-editor inside viewport width
 2020-11-27 11:11:42 +00:00
Niels Lyngsø
48d5682cab Merge remote-tracking branch 'origin/v8/dev' into v8/feature/0000-remove-out-icon 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
 2020-11-27 11:15:37 +01:00
Warren Buckley
46743506ad Merge pull request #7155 from umbraco/v8/feature/0000-NodeJS-minimum-version 
set a minimum version requirement for node
 2020-11-27 10:08:04 +00:00
Warren Buckley
2d1081c51e Merge pull request #7444 from umbraco/v8/feature/round-corners-in-media-picker 
added round corners in umb-media-grid for media-picker
 2020-11-27 10:06:56 +00:00
Niels Lyngsø
5bbf0d04d2 require node v.10 2020-11-27 11:04:07 +01:00
Niels Lyngsø
d5b0080c51 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/0000-NodeJS-minimum-version 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
 2020-11-27 11:02:50 +01:00
Shannon
c08db7763e Gets oauth working (with google) now need to test others and debug why the styles aren't working 2020-11-27 00:44:36 +11:00
nzdev
8d96c6e842 Add check for converted so .startsWith does not throw 2020-11-25 19:33:55 +01:00
Nathan Woulfe
3f776c32f4 Update icon.prevalues.controller.js 2020-11-24 09:05:42 +01:00
Jan Skovgaard
8262f25e20 Listview: Fix icon-picker a11y (#9050) 
* Add proper button and fix icon

* split value to avoid binding icon color in icon attribute

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2020-11-24 17:19:23 +10:00
Bjarne Fyrstenborg
a9a4b0894a Use umb-icon in umb-node-preview (#9072) 
* Use umb-icon in umb-node-preview

* Inherit icon size from umb-icon

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2020-11-24 16:53:08 +10:00
BatJan
fd09d4f319 Convert divs with ng-click to button and wrap texts in paragraphs 2020-11-24 16:02:08 +10:00
Kenn Jacobsen
1076e58cc7 Hide properyt actions for culture invariant properties 2020-11-24 15:55:46 +10:00
Rachel Breeze
388123ff66 Follows the same pattern as create a relationship page title and clears the page title when creating a dictionary item (#9279) 2020-11-24 02:15:58 +01:00
Warren Buckley
604e6f9abb Merge pull request #9322 from umbraco/v8/feature/AB9079-use-tree-for-ElementType-pickers 
V8/feature/ab9079 use tree for element type pickers
 2020-11-23 15:32:13 +00:00
Warren Buckley
9367c24738 Merge pull request #9275 from umbraco/v8/feature/8689-make-settings-and-layout-props-available-for-labels 
Make index, settings and layout props available for labels
 2020-11-23 12:42:55 +00:00
Niels Lyngsø
e13b12a788 make index start at 1... 2020-11-23 13:13:04 +01:00
Niels Lyngsø
14747df4e7 run JS unit test in development script (#9014) 2020-11-23 11:31:31 +01:00
Steve
7c20adef0e Track ng-repeat with id instead of label (#9340) 
(cherry picked from commit 39c4dcdaaa)
 2020-11-23 10:42:33 +01:00
Steve
39c4dcdaaa Track ng-repeat with id instead of label (#9340) 2020-11-23 10:40:18 +01:00
Niels Lyngsø
c578be52ae appended $index to label vars 2020-11-23 10:30:02 +01:00