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

11626 Commits

Author SHA1 Message Date
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
Bjarke Berg
d573928cc1 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
 2021-01-20 15:53:19 +01:00
Sebastiaan Janssen
724d4d1e20 Merge branch 'v8/8.10' into v8/8.11 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:29:47 +01:00
Sebastiaan Janssen
251c5d08ef Merge branch 'v8/8.9' into v8/8.10 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:28:31 +01:00
Sebastiaan Janssen
7d229bc5a9 Merge branch 'v8/8.8' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:27:10 +01:00
Sebastiaan Janssen
435695e2c3 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:25:29 +01:00
Sebastiaan Janssen
59e27c4850 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
 2021-01-20 11:24:02 +01:00
Bjarne Fyrstenborg
b44a3e4280 Inject missing localization service 
(cherry picked from commit c501ef0b68)
 2021-01-20 11:19:37 +01:00
Mads Rasmussen
704fad92e5 Fixes: 9360: Nested validation freezes browser (#9677) 
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
(cherry picked from commit b75a237162)
 2021-01-20 11:09:14 +01:00
Niels Lyngsø
b6558cf734 empty value should also enable in order to stay backwards compatible. 
(cherry picked from commit 2321fbfcab)
 2021-01-20 11:06:03 +01:00
Sebastiaan Janssen
a04af69181 Merge branch 'v8/8.10' into v8/8.11 2021-01-19 17:31:07 +01:00
Bjarne Fyrstenborg
b1eebdd598 Add back icon name in class attribute to work again with font icons 
(cherry picked from commit c1ebfc58cf)
 2021-01-19 17:18:49 +01:00
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.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/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
Sebastiaan Janssen
23a50df3a5 Merge branch 'v8/8.10' into v8/8.11 2021-01-13 17:02:54 +01:00
Sebastiaan Janssen
46faf32c9e Merge branch 'v8/8.9' into v8/8.10 2021-01-13 17:02:29 +01:00
Warren Buckley
86504d69d3 Merge pull request #9644 from umbraco/v8/bug/9432-checkboxes-on-doctype-compositions 
V8/bug/9432: Backoffice UI - checkboxes on doctype compositions uncheck after selecting an item

(cherry picked from commit 0d7a683c60)
 2021-01-13 16:54:26 +01:00
Sebastiaan Janssen
e696aea1fc Merge branch 'v8/8.11' into v8/dev 2021-01-13 16:50:54 +01:00
Sebastiaan Janssen
1842f766ae Merge branch 'v8/8.10' into v8/8.11 2021-01-13 16:50:02 +01:00
Sebastiaan Janssen
7cbc09ba89 Merge branch 'v8/8.9' into v8/8.10 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:49:33 +01:00
Sebastiaan Janssen
29979a55a0 Merge branch 'v8/8.8' into v8/8.9 2021-01-13 16:40:10 +01:00
Sebastiaan Janssen
2fd85c58b5 Merge branch 'v8/8.7' into v8/8.8 2021-01-13 16:38:47 +01:00
Callum Whyte
4dd554172b Nested content UI fixes (#9384) 
* Fixing spacing of nested content header + icon

* Removing border from single Nested Content properties

* fix overlapping icon on nested content with multiple items

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
Co-authored-by: Mads Rasmussen <madsr@hey.com>
(cherry picked from commit 0fdd599596)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
 2021-01-13 16:37:09 +01:00
Mads Rasmussen
f203a69278 move loading spinner to the selected item 2021-01-12 16:17:54 +01:00
Bjarke Berg
fe016dd103 Netcore: Fixes issues with user invites (#9616) 
* AB9629
Fixes issues with user invites
- Issue with the generated link in the invite email
- Allow anonymous access to CurrentUserController.PostSetInvitedUserPassword, as it is used by users not logged in
- Allow anonymous access to AuthenticationController.GetPasswordConfig, as this is used to set a password for newly invited users, before they login

* Fix issues with invite flow

* Fix minor typos

* Fixed issue with validation response and remove/change avatar

* Fix issue with disable users, after all enums are handled like strings

* Fix tests

* Fix other validation issue

* Fix yet another validation issue

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-01-12 16:15:19 +01:00
Mads Rasmussen
7a73e24ecd fixes Backoffice UI - checkboxes on doctype compositions uncheck after selecting an item #9432 2021-01-12 14:13:09 +01:00
Sebastiaan Janssen
cec4a8db8c Merge branch 'v8/8.10' into v8/8.11 2021-01-12 13:52:13 +01:00
Sebastiaan Janssen
542483fb18 Merge branch 'v8/8.9' into v8/8.10 2021-01-12 13:51:36 +01:00
Mads Rasmussen
3d9f765e01 changes search term model from primitive 
(cherry picked from commit 8a65a0f92b)
 2021-01-12 13:49:39 +01:00
Mads Rasmussen
8a65a0f92b changes search term model from primitive 2021-01-12 13:45:39 +01:00
Sebastiaan Janssen
8dbcb8df16 Revert "Removed icon font classes from umb-icon implementations (#9255)" 
This reverts commit 7a71bc5410.
 2021-01-11 11:40:02 +01:00
Sebastiaan Janssen
c10c61b1b6 Revert "Fix legacy icons no longer displaying after changes in #9255" 
This reverts commit 1b95282c17.
 2021-01-11 11:39:48 +01:00
Sebastiaan Janssen
1b95282c17 Fix legacy icons no longer displaying after changes in #9255 
(cherry picked from commit f8692590d0)
 2021-01-11 10:28:40 +01:00
Sebastiaan Janssen
ca5c56dccd Merge branch 'v8/8.10' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
 2021-01-08 15:43:45 +01:00
Sebastiaan Janssen
967485f4e1 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
 2021-01-08 15:18:03 +01:00
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
Nathan Woulfe
ecf061229f Update edit.html 2021-01-04 10:56:52 +01:00
Poornima Nayar
e220baf00c Added ngDocs for contenttyperesource 2020-12-28 11:34:48 +00: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
BatJan
c6b444e055 Replace old search markup with shiny umb-search-filter directive 2020-12-17 02:03:30 +01:00
Bjarne Fyrstenborg
b4ef93e1b4 Use ace xml mode for package actions 2020-12-17 09:27:41 +10:00
Poornima Nayar
37aa00dc4a Created ngDocs for modelsBuilderManagementResource 2020-12-17 09:03:57 +10:00
Poornima Nayar
7e15c6fd78 Updated ngDocs for elementTypeResource 2020-12-17 09:02:23 +10: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
Poornima Nayar
102ae0c402 Updated the UI docs for the authresouce 2020-12-16 09:46:03 +10:00
Bjarne Fyrstenborg
9bcfbf282b Temporary fix to ensure content wrapper is positioned 0px from left in section without tree 2020-12-16 09:38:54 +10: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