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

34065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
d1e334fe48 Merge pull request #8255 from umbraco/netcore/feature/get-remaining-seconds 
Migrate Get remaining seconds functionality
 2020-06-11 15:02:23 +02:00
Bjarke Berg
0b636bc225 Fix tests 2020-06-11 14:17:12 +02: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
a709783168 Merge pull request #8234 from umbraco/netcore/feature/macros 
Netcore: Migreate macro related controllers
 2020-06-11 12:39:09 +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
Bjarke Berg
45dcf62878 remove unused code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:58:25 +02:00
Bjarke Berg
6d701f17c3 remove unused code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:57:28 +02:00
Bjarke Berg
39b3b7a723 Fix csproj 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:53:43 +02:00
Bjarke Berg
c726054e5d Fix csproj 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 13:49:30 +02: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
1278b53e7f Merge pull request #8225 from umbraco/netcore/feature/websecurity 
Migrates more cookie auth and IWebSecurity
 2020-06-10 12:01:02 +02:00
Bjarke Berg
ece1973949 Merge remote-tracking branch 'origin/netcore/feature/websecurity' into netcore/feature/websecurity 2020-06-10 11:18:07 +02:00
Bjarke Berg
1973dd371a Fix for login doing install 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 11:17:55 +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
856d954311 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:11:56 +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
2b412f337c Fixes issue with growing cookie/identity (we don't want to use Actor), fixes GlobalSettings issue, ensures temp claims are not cloned 2020-06-09 17:40:35 +10:00
Shannon
246e28d147 Implements PostLogout and ensures all appropriate cookies are cleared on logout along with ensuring that the ticket is renewed each user seconds request if configured to stay logged in. 2020-06-09 14:36:36 +10:00
Shannon
9b991f3882 Fixes back office check, adds more tests, changes area to be a constant 2020-06-09 13:01:05 +10:00
Shannon
ed2aba49d6 fix build, adds tests 2020-06-09 12:35:31 +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
57a087861c Merge pull request #8242 from AndyButland/feature/netcore-trees 
Netcore: Migrated some tree related classes
 2020-06-08 15:19:04 +02: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
af382e5e71 Migrated section controller + LanguageTreeController, ApplciationTreeController. 
Updated AngularJsonOnlyConfigurationAttribute to be a TypeFilterAttribute, to allow injeciton into the filter.

Note: Left TODO about checking authorization of proxied trees..
 2020-06-08 13:14:23 +02:00
Bjarke Berg
01433ee190 Removed views from csproj file 2020-06-08 09:02:27 +02:00
Bjarke Berg
b5f0a7348d Avoid using Current.IOHelper 2020-06-08 08:51:50 +02:00
Andy Butland
458de2b0be Migrated tree related classes to .NET core 2020-06-07 09:34:32 +02:00
Bjarke Berg
8694498583 Fix for model in templates 2020-06-05 13:31:08 +02:00
Bjarke Berg
39ace69879 Added runtime compilation of views 2020-06-05 12:50:26 +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
1231ef78db Merge pull request #8230 from umbraco/netcore/feature/AB6961-IWebSecurity-injection 
Netcore: Removing UmbracoContext.Security usages
 2020-06-05 07:47:19 +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
6a560d6340 Fixed tests 2020-06-05 06:36:42 +02:00
Bjarke Berg
1d543d1dfd Migrated MacroRenderingController + Related UmbracoComponentRenderer => TemplateRenderer + ParitalViewMacroEngine 2020-06-05 06:31:42 +02:00
Bjarke Berg
772041bb8f Migrated MacrosController.cs 2020-06-05 06:17:54 +02:00
Elitsa Marinovska
582903b597 Null check 2020-06-04 15:16:34 +02:00
Elitsa Marinovska
7b93130690 Changing to the specific property 2020-06-04 13:55:48 +02:00
Elitsa Marinovska
68488eb5a7 Another round of injecting webSecurity directly 2020-06-04 13:55:07 +02:00
Elitsa Marinovska
42fba97af9 Removing the need of requesting umbracoContext to get the web security service 2020-06-04 13:53:06 +02:00
Elitsa Marinovska
e32d5bb9b9 Injecting IWebSecurity directly instead of getting it through UmbracoContext.Security 2020-06-04 13:40:33 +02:00
Bjarke Berg
c363b5a5c2 Added migrated controllers to BackOfficeServerVariables 2020-06-03 19:52:43 +02:00
Bjarke Berg
b2b0291386 Netcore: Migration of more controllers (#8220) 
* https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Migrated DictionaryController, TinyMceController and UpdateCheckController

* Removing connection string and changing to use the right variable

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-06-03 17:17:30 +02:00
Bjarke Berg
d682bc9903 Uncommented test of code moved to .NET Core 2020-06-03 13:33:05 +02:00
Shannon
b421cc67f4 moves test 2020-06-03 18:25:54 +10:00
Shannon
0d0b3324fb Merge branch 'netcore/feature/websecurity' into netcore/feature/get-remaining-seconds 2020-06-03 18:11:59 +10:00
Shannon
4ca87d8923 Merge branch 'netcore/feature/websecurity' of https://github.com/umbraco/Umbraco-CMS into netcore/feature/websecurity 2020-06-03 18:10:54 +10:00
Shannon
846432111d fixes tests 2020-06-03 18:10:35 +10:00