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

11646 Commits

Author SHA1 Message Date
Mole
70b04e8a8a Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/packages-with-actions 2021-02-25 13:48:16 +01:00
Mole
f4787f9ae5 Add undo actions to the root node instead of appending them 
also fix minor UI bug
 2021-02-25 12:36:28 +01:00
Mole
2fcae1cc28 Fix installing packages. 2021-02-24 12:54:30 +01:00
Bjarke Berg
7c4982a04d Fixed issues with embed serialization + view 
added missing view for grid media
+ Fixed null issues in js
 2021-02-05 18:41:52 +01:00
Mole
f8c7b9e639 Merge pull request #9748 from umbraco/netcore/feature/healthchecks 
NetCore: Updated healthchecks
 2021-02-05 09:55:07 +01:00
Bjarke Berg
53eff154a6 Cleanup and added missing view 2021-02-03 09:12:39 +01:00
Bjarke Berg
8624a246ba Updated healthchecks to show a link to documentation instead of trying to fix something that can often not be fixed automatically. 2021-02-03 07:42:56 +01:00
Bjarke Berg
14284b64c2 Bugfixes.. 
- ModelsBuilder: Inject PublishedValueFallback into static Mixins
- ModelsBuilder: Throw exception if compiler can't compile the code
- CheckIfUserTicketDataIsStaleAttribute: Scope issue
- Ambiguous Actions: Couldn't determine the action when empty arrays was passed. Fixed by using more v8 like solution. (Still stupid the client not just have different endpoints)
- Fixed issue with reading the body from post requests. Often we where not allowed to seek in the stream.
- UmbracoHelper: Made available on UmbracoViewPage
- Client entity.resource.js: Don't ask server when getByIds has 0 ids.
- Client content.resource.js: Renamed endpoint GetEmptyBlueprint to avoid ambiguous action name
 2021-02-01 13:04:45 +01:00
Bjarke Berg
4a3941620d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-25 08:54:37 +01:00
Bjarke Berg
08ee15534c Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 2021-01-21 09:51:36 +01:00
Bjarke Berg
132c4f7910 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-21 09:37:44 +01:00
Bjarke Berg
9f2863892d Merge pull request #9672 from umbraco/netcore/task/models-builder-9789 
Get MB with PureLive working for netcore
 2021-01-21 09:24:03 +01:00
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
Mads Rasmussen
8e64fe54b1 updates the css to support items with long titles 2021-01-20 15:01:06 +01:00
Sebastiaan Janssen
ee02e34f64 Merge branch 'v8/8.10' into v8/8.11 2021-01-20 14:48:08 +01:00
Sebastiaan Janssen
bfde020d4f Merge branch 'v8/8.9' into v8/8.10 2021-01-20 14:47:26 +01:00
Sebastiaan Janssen
2c037f604d Merge branch 'v8/8.8' into v8/8.9 2021-01-20 14:46:20 +01:00
Sebastiaan Janssen
908dbb1454 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
 2021-01-20 14:42:22 +01:00
Niels Lyngsø
52e8da2ff2 Call rebindCallback on errors as well (#9690) 
(cherry picked from commit da0c82aabd)
 2021-01-20 14:28:37 +01:00
Niels Lyngsø
bc8f8366c2 Call rebindCallback on errors as well (#9688) 
(cherry picked from commit 6d712b0d16)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
 2021-01-20 14:17:02 +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
Shannon
1614e9a53c Removes MB.Enabled since it doesn't make since, Removes MB.EnableFactory since that cannot ever be not enabled, fixes up settings usage, primarily we just check for models mode 2021-01-19 18:29:14 +11: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