Bjarke Berg
|
e3ac778fc9
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Cache/WebCachingAppCache.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
# src/Umbraco.Web/Macros/MacroRenderer.cs
# src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
|
2020-04-01 12:44:53 +02:00 |
|
Joe Delly
|
2ec0861051
|
Fix for exception throw when validating URLs (#7701)
|
2020-03-24 18:35:11 +01:00 |
|
Bjarke Berg
|
58f9b48e16
|
Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core
# Conflicts:
# src/Umbraco.Abstractions/UriExtensions.cs
# src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
# src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
# src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
|
2020-01-07 09:46:42 +01:00 |
|
Andy Butland
|
d469a2153b
|
Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection.
|
2019-12-20 17:36:44 +01:00 |
|
Bjarke Berg
|
dfeb97caa4
|
AB3677 - Moved usages of Current (Core) to Current (Web)
|
2019-12-19 15:53:50 +01:00 |
|
Bjarke Berg
|
7f9fbe9877
|
AB4227 - Removed StringExtensions from core..
|
2019-12-18 18:55:00 +01:00 |
|
Bjarke Berg
|
becce7800b
|
Moved Models from Umbraco.Core to Umbraco.Infrastructure
|
2019-12-09 14:12:06 +01:00 |
|
Bjarke Berg
|
2ea8e7cdd0
|
Moved PropertyEditors from Umbraco.Core to Umbraco.Infrastructure
|
2019-12-09 10:44:22 +01:00 |
|
Bjarke Berg
|
204bbd5c46
|
Moved IOHelper to abstractions
|
2019-12-05 10:41:58 +01:00 |
|
Shannon
|
76b413e527
|
Removes all references of System.Web.Security from core project
|
2019-11-25 23:37:30 +11:00 |
|
Shannon
|
57ff36452e
|
Moves Strings and extensions to abstractions (where possible)
|
2019-05-20 17:57:28 +02:00 |
|
Stephan
|
51f6c639bf
|
Cleanup Url token encoding
|
2019-02-21 09:35:38 +01:00 |
|
Stephan
|
025cdede6c
|
Merge branch origin/temp8 into temp8-di2690
|
2019-01-04 11:43:14 +01:00 |
|
Claus
|
9821901717
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web/UI/LegacyDialogHandler.cs
# src/Umbraco.Web/WebServices/SaveFileController.cs
|
2019-01-04 11:30:51 +01:00 |
|
Claus
|
71f2b7ee06
|
updating unit tests.
|
2019-01-04 09:40:55 +01:00 |
|
elitsa
|
0aa1dc1dc7
|
Adding tests for verifying that malicious code input will be cleaned for XSS.
|
2018-12-27 10:02:49 +01:00 |
|
Stephan
|
c6891c6c70
|
RegisterUnique
|
2018-11-29 10:35:16 +01:00 |
|
Stephan
|
f9a19ada04
|
IContainer.die.die.die
|
2018-11-28 12:59:40 +01:00 |
|
Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
Shannon
|
0c5cf5256b
|
manual merge pass #2
|
2018-10-02 12:57:19 +02:00 |
|
Sebastiaan Janssen
|
9008e6af88
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# docs/CONTRIBUTING_DETAILED.md
# docs/README.md
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
# src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
|
2018-06-06 21:15:11 +02:00 |
|
Mundairson
|
379ac8a3cb
|
Refactored the extension method to call the native method.
|
2018-06-05 12:25:06 +01:00 |
|
Shannon
|
9b08a73210
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Tests/Strings/StringExtensionsTests.cs
# src/Umbraco.Web/UmbracoHelper.cs
|
2018-05-30 15:29:08 +10:00 |
|
Dan Booth
|
9c65ed92f1
|
Added string ContainsAny tests for the ContainsAny(haystack, needles, comparison) extension method
|
2018-05-10 14:29:00 +01:00 |
|
Stephan
|
038fc87a40
|
Cleanup, fix tests
|
2018-04-30 15:11:01 +02:00 |
|
Shannon
|
3cdc0e1142
|
Removes IShortStringHelper.ReplaceMany, this should just be a normal string extension and removes the need to load in IUmbracoSettings for this simple purpose, this fixes some unit tests
|
2018-04-27 10:26:32 +10:00 |
|
Stephan
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Stephan
|
9ed6576908
|
Port 7.7 - WIP
|
2017-09-19 15:51:47 +02:00 |
|
Shannon
|
f7097d571c
|
U4-10301 Change the PluginManager hash to use more reliable and consistent hashes
|
2017-08-17 11:38:57 +10:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|
Stephan
|
81234cd702
|
Rename DI to Composing
|
2017-05-30 15:46:25 +02:00 |
|
Stephan
|
d17959d1a8
|
Tests reorg
|
2016-12-16 10:40:14 +01:00 |
|
Stephan
|
224986d56c
|
Trying to cleanup and refactor tests
|
2016-11-07 18:32:44 +01:00 |
|
Stephan
|
341e817fd5
|
Get tests to run, troubleshoot
|
2016-10-17 11:00:18 +02:00 |
|
Stephan
|
a00ee8d275
|
Rename DependencyInjection into DI, cleanup components, compose
|
2016-10-17 11:00:12 +02:00 |
|
Stephan
|
e25e77f167
|
Resvolution - WIP running without Resolution
|
2016-09-19 16:33:40 +02:00 |
|
Stephan
|
3707db6c21
|
Resvolution - ShortStringHelperResolver
|
2016-09-19 16:33:37 +02:00 |
|
Sebastiaan Janssen
|
de0bb494a5
|
Improving Build.bat and appveyor build output
Moving all Console.Write* to Debug.Print
|
2016-07-14 14:11:05 +02:00 |
|
Shannon
|
0ca1807d64
|
Adds DelegateExtensions + Tests which is used for retrying and is used with the Examine Index Sync
|
2015-08-13 15:19:04 +02:00 |
|
Shannon
|
d5460068d4
|
Merge remote-tracking branch 'origin/master-v7' into dev-v7
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Macros/MacroTagParser.cs
src/Umbraco.Core/packages.config
src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
src/Umbraco.Tests/Macros/MacroParserTests.cs
src/Umbraco.Tests/Strings/StringExtensionsTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Editors/BackOfficeController.cs
src/umbraco.cms/Actions/Action.cs
|
2015-07-16 17:04:25 +02:00 |
|
Shannon
|
b3a93e369a
|
WIP - bit of a refactor on the IFile stuff, moves all validation to the service level and obsoletes the IFile.IsValid methods. Adds v5 style CSS property parsing, but might integrate that with this zany css parser in the core for 'safer' parsing.
|
2015-01-14 12:09:30 +11:00 |
|