Shannon
|
6ad28f1103
|
Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IEntityService.cs
# src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
# src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
# src/Umbraco.Web/Controllers/UmbProfileController.cs
# src/Umbraco.Web/Controllers/UmbRegisterController.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
# src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebBootManager.cs
|
2019-07-17 21:58:33 +10:00 |
|
Shannon
|
bfb69a34ef
|
re-adds back in the serialization overloads for the custom exception, re-adds detailed error messages, adds more documentation. Adds unit tests.
|
2019-07-17 21:15:18 +10:00 |
|
Shannon
|
02e3a8f19c
|
Removes all inter-dependencies between UmbracoContext, UmbracoHelper and MembershipHelper and moves Html methods to HtmlHelper extensions. This simplifies UmbracoHelper and MembershipHelper to not require huge dependencies and splits the logic in a nicer fashion instead of wrapping everything
|
2019-02-15 11:43:56 +11:00 |
|
Sebastiaan Janssen
|
5a896e7417
|
Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)
(cherry picked from commit fedf0c78de)
|
2019-01-25 16:06:49 +01:00 |
|
Sebastiaan Janssen
|
9e0d2e5873
|
Revert "Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)"
This reverts commit fedf0c78de.
|
2019-01-24 11:37:28 +01:00 |
|
Sebastiaan Janssen
|
fedf0c78de
|
Remove obsoleted RelatedLinks picker (replaced by Multi URL Picker)
|
2019-01-23 09:01:53 +01:00 |
|
Sebastiaan Janssen
|
b865c6b476
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
|
2019-01-13 23:22:10 +01:00 |
|
christophnz
|
282ac2b9c5
|
Added 2 HtmlHelper extension methods for rendering RelatedLinks, including Unit tests
|
2019-01-13 15:17:13 +01:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|
Shannon
|
d32991c30a
|
re-organizing some namespaces for tests
|
2016-02-17 10:59:48 +01:00 |
|