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

11541 Commits

Author SHA1 Message Date
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
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
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
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
BatJan
c8d837bb97 Change div with ng-click to button and add fallback for dictionary item 2020-11-23 16:42:17 +10:00
Laura Weatherhead
ceaf1699d8 Update umb-button directive parameter usage to reflect accurate implementation 2020-11-23 16:37:37 +10:00
Bjarne Fyrstenborg
7fc3ec82bd Help drawer adjustments (#9090) 
* Format document

* Ensure help drawer can be closed using esc key

* Add rel="noopener" for security reasons

* Remove additional whitespace
 2020-11-23 16:36:12 +10:00
John Kilmister
8b9585398e Issue 8353 - Fix of issue that caused small screens labels alignment (#9047) 
* Issue 8353 - Fix of issue that caused on small screens labels to be right aligned dispite being on own line

* Issue 8353 Support smaller screens
 2020-11-23 16:07:47 +10:00
Jan Skovgaard
8549d1ac7a ContextDialog: Accessibility improvements (#9045) 
* Add role and aria attributes as well as a screen reader only description

* Add translations to language files
 2020-11-23 09:59:43 +10:00
patrickdemooij9
98610b50d3 8838: Node Actions menu should be disabled on listview (#9021) 
* 8838: Node Actions menu should be disabled on listview

* 8838: Set disable actions menu on event
 2020-11-23 09:35:38 +10:00
BatJan
f3ec66be4c Various fixes in the view 2020-11-20 11:15:14 +10:00
Kenn Jacobsen
c9bf1a0bc2 Add confirmation dialog to media picker "remove all entries" action 2020-11-20 10:52:47 +10:00
Sebastiaan Janssen
4e5b2e4b82 Fixes #6089 
JsDiff.diffWords in Rollback freezes browser
 2020-11-19 09:47:06 +01:00
Joe Glombek
02d8b3c339 Accessibility (keyboard navigation): The 'Content' drop down menu opens automatically when tabbing (#9325) 
* Use umb-dropdown directive for Content dropdown

To allow keyboard toggling and automatic collapsing on click elsewhere

* Hide menu on blur

Co-authored-by: Joe Glombek <joe@rockdove.uk>
 2020-11-18 15:14:48 +00:00
Kenn Jacobsen
353aaa46c7 Make Nested Content icons centered and same size as Block Editor 2020-11-18 11:57:26 +01:00
Shannon
99247d7fbe Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
 2020-11-18 16:02:51 +11:00
Tomas Foss Renaa
c88e2be2ac remove bottom offset 2020-11-18 13:09:38 +10:00
Matt Darby
8a1e281158 Remove double editorService.close() (#9301) 2020-11-18 01:20:04 +01:00
Kenn Jacobsen
8de2f4920a Do not show cryptic confirm dialog when editing group 2020-11-17 09:29:31 +10:00
Bjarne Fyrstenborg
bb7e53434d Allow to close overlay via esc shortcut 2020-11-17 09:00:50 +10:00
Rachel Breeze
ee08542add Added missing documentation for content menu (#9201) 2020-11-17 08:50:07 +10:00
Laura Weatherhead
cc74be5a27 Fix mis-spelt "occurred" 2020-11-17 08:49:01 +10:00