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

34246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c2b2b5010d Review + build fix 2020-06-11 13:04:01 +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
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
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
6440abbda9 Updated BackOfficeServerVariables 2020-06-11 08:00:35 +02:00
Kenn Jacobsen
ae993519ce Fix radio button checked appearance 2020-06-10 21:14:07 +02:00
Bjarke Berg
6f0c30dc37 Fix tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:57:57 +02: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
Rachel Breeze
1347b973f1 V8/tmplogin (#8203) 2020-06-10 17:20:44 +02:00
Warren Buckley
3680f22321 Allows unpublished content to render a macro HTML in the RTE 2020-06-10 14:33:32 +01: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
Claus
c4e465ce1f Merge pull request #8175 from kjac/v8/fix/checkbox-background-glitch 
Fix glitch in umb-checkbox background
 2020-06-09 14:26:27 +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
Thomas Andresen
a06952c65f If content type is deleted/changed which other document types has a reference to, fire a change event for those 2020-06-09 09:36:12 +02:00
Warren Buckley
e82f504658 Adds skipStepIfVisible property to JSON Tour Steps to allow skipping if DOM item is present (#8235) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2020-06-09 08:55:06 +02: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
Warren Buckley
29f0ba0b37 Merge pull request #5466 from umbraco/v8/api-docs-update 
Api documentation functions update
 2020-06-08 13:59:42 +00: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
Kenn Jacobsen
4266e2b1d1 Fix "Edit: undefined" in content editor title 2020-06-08 09:20:06 +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