yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,663 Commits 4 Branches 7 Tags
72671dbca8e421fc7b3dbd9ca8d71d7c0723bb08
Commit Graph

11854 Commits

Author SHA1 Message Date
Sebastiaan Janssen
f48b88e84f Merge branch 'v8/8.10' into v8/8.11 2021-01-20 15:07:14 +01:00
Sebastiaan Janssen
ef96b47899 Merge branch 'v8/8.9' into v8/8.10 2021-01-20 15:05:42 +01:00
Sebastiaan Janssen
092683ef7b Merge branch 'v8/8.8' into v8/8.9 2021-01-20 15:04:08 +01:00
Mads Rasmussen
0c9b4565f1 updates the css to support items with long titles 
(cherry picked from commit 8e64fe54b1)
 2021-01-20 15:03:06 +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ø
da0c82aabd Call rebindCallback on errors as well (#9690) 2021-01-20 14:26:40 +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
Niels Lyngsø
6d712b0d16 Call rebindCallback on errors as well (#9688) 2021-01-20 14:11:12 +01:00
Sebastiaan Janssen
1c22ce9de0 Merge branch 'v8/dev' into v8/contrib 2021-01-20 11:31:28 +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
Rachel Breeze
14961e670d Improvements to validation and accessibility of relationship create view (#9154) 
* Improved validation on save for relationships and also added support for accesibilty

* Moved the localisation into the radiobutton and added support for localisation using lavel-key in the UmbRadioButtonController

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-01-20 09:12:46 +10:00
Bjarne Fyrstenborg
c501ef0b68 Inject missing localization service 2021-01-20 09:06:29 +10:00
Warren Buckley
9601dead7b V8: Angular Divorce: isFunction (#7861) 
* Bye bye angular.isFunction & use Utilities.isFunction

* Utilities.js is not available on first load - replace isFunction detection with underscore equivalent

* found a stray isFunction

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-01-20 08:40:21 +10:00
Warren Buckley
0822f0cbe5 V8: Angular Divorce: equals (#7860) 
* Bye bye angular.equals & use Utilities.equals which is still using angular.equals under the hood for now

* Update umbvariantcontenteditors.directive.js

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-01-20 08:27:28 +10: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
Bjarne Fyrstenborg
c1ebfc58cf Add back icon name in class attribute to work again with font icons 2021-01-19 17:18:14 +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
Rasmus John Pedersen
9851c308f5 Add custom error page for BootFailedException 2021-01-15 09:25:16 +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
e8b8723f51 Merge branch 'v8/dev' into v8/contrib 2021-01-13 16:51:29 +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
Callum Whyte
0fdd599596 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>
 2021-01-13 15:11:50 +01:00
Bjarne Fyrstenborg
16cd19ed9a Fix styling of search icon in search filter 2021-01-13 13:58:54 +00:00
Bjarne Fyrstenborg
1ccd3e6ec1 Fix issue with button didn't do anything 2021-01-13 22:10:11 +10:00
Poornima Nayar
1d6d4aec56 ngDocs for contentresource (#9570) 
* ngDocs for contentresource

* Update content.resource.js

typo: paramater => parameter

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-01-13 21:58:19 +10:00
Bjarne Fyrstenborg
2398c40720 Replace jQuery trim() using vanilla JS 2021-01-13 09:22:01 +10:00
David Brendel
143d2e7e30 Check if urls is null 
Check if node.urls is null and set scope.currentUrls to null and return
 2021-01-13 09:17:04 +10: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