yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,879 Commits 4 Branches 7 Tags
43efee9647ed8f2eaab3ec2b71d3dd3eb46b9017
Commit Graph

5200 Commits

Author SHA1 Message Date
Niels Lyngsø
b0b5d2ff78 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list 2020-06-15 11:05:00 +02:00
Bjarke Berg
989c83b452 Merge remote-tracking branch 'origin/netcore/feature/migrate-remaining-trees' into netcore/feature/contentcontroller_and_related 2020-06-12 10:03:37 +02:00
Bjarke Berg
b9da273cbd Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-12 07:13:00 +02:00
Bjarke Berg
82022240f3 Merge pull request #8277 from electricsheep/feature/netcore-unit-tests 
Migrate unit tests to new test project
 2020-06-12 06:42:24 +02:00
Ollie Philpott
5d5c7ba95e Move XmlExtensionsTests 2020-06-11 15:13:35 +01:00
Ollie Philpott
7aadae68d8 Move VersionExtensionTests 2020-06-11 14:59:14 +01:00
Ollie Philpott
663adc1db7 Move HexEncoderTests 2020-06-11 14:56:24 +01:00
Ollie Philpott
449bf55060 Move GuidUtilsTests 2020-06-11 14:54:19 +01:00
Ollie Philpott
299a461afb Move EnumExtensionsTests 2020-06-11 14:50:10 +01:00
Ollie Philpott
cb3a5d6b97 Move EnumerableExtensionsTests 2020-06-11 14:48:57 +01:00
Ollie Philpott
958b4f431e Move DelegateExtensionsTests 2020-06-11 14:47:08 +01:00
Ollie Philpott
3da8fd4a98 Move AttemptTests 2020-06-11 14:41:48 +01:00
Ollie Philpott
06a1671f95 Move ClaimsIdentityExtensionsTests 2020-06-11 14:39:45 +01:00
Ollie Philpott
eabf6f459b Move TestClone class 2020-06-11 14:39:10 +01:00
Bjarke Berg
e8c0a08ea8 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 15:21:51 +02:00
Bjarke Berg
918e7f1be3 Merge branch 'netcore/dev' into netcore/netcore 2020-06-11 15:17:42 +02:00
Bjarke Berg
d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00
Ollie Philpott
9914d6037e Merge branch 'netcore/dev' of https://github.com/electricsheep/Umbraco-CMS into feature/netcore-unit-tests 2020-06-11 14:01:45 +01:00
Bjarke Berg
16038e4232 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 2020-06-11 13:48:20 +02:00
Bjarke Berg
925324041c review fixes 2020-06-11 12:41:29 +02:00
Bjarke Berg
27fee12230 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-remaining-trees 2020-06-11 12:40:17 +02:00
Bjarke Berg
f86d8185bf Clean up and based on review comments 2020-06-11 11:21:07 +02:00
Bjarke Berg
57b8ab201d Clean up and fixed second ctor in PhysicalFileSystem 2020-06-11 11:07:21 +02:00
Shannon Deminick
fec8f1beb7 Merge pull request #8214 from umbraco/v8/bugfix/8199-missing-nc-tests 
oops, adds missing tests for NestedContentPropertyComponent
 2020-06-11 17:46:59 +10:00
Bjarke Berg
05610b56eb Fix tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:45:46 +02:00
Bjarke Berg
aa7637129c Fix tests by reintroducing some files in Umbraco.Web 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:23:56 +02:00
Bjarke Berg
835b04273f Migrated remaining *TreeController's 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:22:25 +02:00
Warren Buckley
7807ded479 Adds in missing tests for a complex editor such as the grid storing a NC value along with replacing only missing keys 2020-06-10 16:33:51 +01:00
Bjarke Berg
96fee753b4 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBackOfficeServiceCollectionExtensions.cs
 2020-06-10 12:17:37 +02:00
Bjarke Berg
9f17049582 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/websecurity 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-10 11:13:32 +02:00
Bjarke Berg
9aea7039d2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
 2020-06-10 10:55:56 +02:00
Shannon
1522260111 Reverts the nested content changes, fixes up the GetEmptyByKey 2020-06-10 18:09:54 +10:00
Shannon
a5adb322f1 Updates the caching layer to handle GUID keys for content types while preserving backwards compat, fixes unit tests, removes the strongly typed lists for the block editor value since it's unecessary 2020-06-10 16:12:00 +10:00
Shannon
433a7c8908 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/get-remaining-seconds 
# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
 2020-06-09 10:41:57 +10:00
Bjarke Berg
c35d2c0793 Migrated section controller + LanguageTreeController, ApplciationTreeController. 
Updated AngularJsonOnlyConfigurationAttribute to be a TypeFilterAttribute, to allow injeciton into the filter.

Fixed test
 2020-06-08 14:07:36 +02:00
Bjarke Berg
1029f4fe0b Fix for filesystems. Now rooted at the content root and not the www root 2020-06-05 11:36:59 +02:00
Bjarke Berg
354225452a Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-05 08:14:23 +02:00
Bjarke Berg
58d7fc1817 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
 2020-06-05 08:05:50 +02:00
Bjarke Berg
10fe1ec47b Fixed tests by registering IWebSecurity in the container in the base test class 2020-06-05 07:17:19 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Niels Lyngsø
aa447bc704 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list 2020-06-04 15:09:48 +02:00
Bjarke Berg
d682bc9903 Uncommented test of code moved to .NET Core 2020-06-03 13:33:05 +02:00
Shannon
0d0b3324fb Merge branch 'netcore/feature/websecurity' into netcore/feature/get-remaining-seconds 2020-06-03 18:11:59 +10:00
Shannon
6004a0fb44 wip starts migrating get remaining seconds, removes a bunch of code from netframework thats already been moved. 2020-06-03 17:47:32 +10:00
Shannon
7ac01fc02f Merge branch 'netcore/netcore' into netcore/feature/websecurity 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs
 2020-06-03 13:26:40 +10:00
Shannon Deminick
a7a463c7d4 Merge pull request #8183 from umbraco/netcore/feature/identity 
Back office identity changes and cookie authentication
 2020-06-03 12:55:57 +10:00
Chad
a4274ba767 Shorter JSON property names for nucache (#8204) 2020-06-02 11:35:19 +02:00
Shannon
670d62a2dc Gets cookie authentication actually working along with session validation 2020-06-02 17:48:08 +10:00
Shannon
4afaade436 Gets WebSecurity implemented 2020-06-02 14:46:58 +10:00
Shannon
b75fba71f5 Cleaning up websecurity and implementing it, migrates security stamp and session id validation for cookie auth 2020-06-02 13:28:30 +10:00