yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,504 Commits 4 Branches 7 Tags
19715ef45f4dde44e7c44cd6c7acc768ef89ed2a
Commit Graph

12504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
19715ef45f Fixes build, updated BackgroundTaskRunner to get an ILogger injected 2015-04-09 17:12:52 +10:00
Shannon
a1c7352da1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Integration/GetCultureTests.cs
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Tests/Models/ContentTypeTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/Mvc/SurfaceController.cs
 2015-04-09 16:50:07 +10:00
Shannon
c525be3e44 Completes: U4-6474 Update to latest examine v0.1.62 2015-04-09 15:33:58 +10:00
Shannon
cc804bd3bd removes duplicate test 2015-04-08 17:57:00 +10:00
Shannon
24dc8309f1 sets ConfigureAwait(false) for XmlCacheFilePersister await calls and BackgroundTaskRunner await calls since these are always on background threads, no synchronizing with any context. 2015-04-08 17:15:21 +10:00
Shannon
ce81f9b1b1 we'll try these tests again 2015-04-08 17:08:06 +10:00
Shannon
3f70761d49 this should fix one of the tests 2015-04-08 17:01:38 +10:00
Shannon
dee45146a4 applies a max timout for BackgroundTaskRunnerTests 2015-04-08 16:55:34 +10:00
Shannon
b35397b464 uses property type ctor overload to accept an alias which prob should have been there all along since in most cases you need an alias to create one (same prob goes for property groups, etc... but oh well). Adds a couple tests for case insensitive comparisons in PropertyCollection 2015-04-08 16:33:16 +10:00
Shannon
147cc92ac5 Updates BackgroundTaskRunner & tests: removes the need for most Thread.Sleep which is error prone, this is done by updating the GetAwaiter() method to be a custom awaiter so we can await the entire background task running operations. We then add a property called CurrentThraedingTask which then allows awaiting the current Task instance. Adds error handling to all event handlers for the task runner. Changes events to be TypedEventHandlers 2015-04-08 16:28:42 +10:00
Shannon
3230fce76a fixes lock on PropertyCollection, should just be a normal lock 2015-04-08 11:47:16 +10:00
Shannon
1d22c1e81e fixes get hash code on Entity base class 2015-04-08 11:47:00 +10:00
Shannon
ece2e2359e Updates PropertyGroup's equality comparisons to: check the base comparison, then check for a case insensitive comparison with name, fixes GetHashCode to be consistent with the Equals method. 2015-04-08 11:31:14 +10:00
Shannon
8cbe53f49d Updates PropertyType to have a ctor overload accepting an alias when one already exists. Updates it's equality comparisons to: check the base comparison, then check for a case insensitive comparison with alias, fixes GetHashCode to be consistent with the Equals method. 2015-04-08 11:30:35 +10:00
Shannon Deminick
cac3ddc3c8 Merge pull request #666 from JimBobSquarePants/dev-v7 
Remove Content Service Setter case sensitivity
 2015-04-08 10:07:34 +10:00
Shannon
0eac50ceba Fixes: U4-6506 Grid config in package.manifest doesn't allow for multiple grid editors and adds tests 2015-04-07 17:24:35 +10:00
Shannon
d5e735ac14 Fixes singleton accessors and adds ctor which would allow unit testability. 2015-04-07 12:07:54 +10:00
Shannon Deminick
8d841d3537 Merge pull request #667 from AndyButland/u4-1733 
U4-1733 - Added overloads to RedirectToUmbracoPage methods to allow passing of a querystring
 2015-04-07 11:05:05 +10:00
Sebastiaan Janssen
5f175874b2 Fixes tests and adds a few 2015-04-02 17:52:59 +02:00
Sebastiaan Janssen
fa053426c3 Don't disableFindContentByIdPath when in preview mode 2015-04-02 17:16:56 +02:00
Shannon
59dd6e0941 updates repo config 2015-04-02 14:59:03 +11:00
Shannon
a321d4d1b8 Allows the ability to use external logins to login to authorize upgrades, this means being able to add reserved paths at startup dynamically which is now built in as part of the AuthenticationOptionsExtensions for registering external logins for the back office. 2015-04-02 14:46:53 +11:00
AndyButland
437e7f0ffc Removed unused usings from previous commit 2015-04-01 23:29:43 +02:00
AndyButland
afa6c35bb5 Added overloads to RedirectToUmbracoPage methods to allow passing of a querystring 2015-04-01 23:27:20 +02:00
Stephan
22ac571c7d U4-6479 - fix GetCulture for unpublished content + add tests 2015-04-01 15:40:34 +02:00
James South
8d00dbf648 Remove Content Service Setter case sensitivity 
Makes property alias key checking case-insensitive bringing behaviour in
line with IPublishedContent getters.
 2015-04-01 12:37:28 +01:00
Stephan
cd26a1ad21 U4-6479 - fix GetCulture for unpublished content + add tests 2015-04-01 12:59:01 +02:00
Shannon
40d3f2ffb9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2015-04-01 17:45:38 +11:00
Shannon
437ab4aaf1 Fixes installer permission steps - this cannot just arbitrarily write to the umbraco xml cache file 2015-04-01 17:44:27 +11:00
Shannon
0c0802e964 updates the migrations to use the correct ctor (not empty), this is more for v8 but have created a crappy activator that passes in the right args. 2015-04-01 17:43:27 +11:00
Shannon
2a6d5846d1 Fixes installer permission steps - this cannot just arbitrarily write to the umbraco xml cache file 2015-04-01 16:57:32 +11:00
Shannon
a43847bc8b Adds IsUpgrading method to ApplicationContext and fixes AppBuilderExtensions checks since we need a user manager when upgrading 2015-04-01 16:12:32 +11:00
Shannon
df6bb36876 moves notification logic to umbnotifications.directive instead of in main (not sure why it was there). Updates the AuthorizeUpgrade screen to be able to show YSOD or alert messages when there are server errors. Adds htmlhelper extensions to share between Default.cshtml and AuthorizeUpgrade.cshtml. Adds null check for BackOfficeUserManager. 2015-04-01 16:04:19 +11:00
Shannon
d185f93c35 Fixes unit tests 2015-04-01 14:29:35 +11:00
Shannon
df2ce2c133 fix merge 2015-04-01 14:05:29 +11:00
Shannon
5e90e74969 Merge branch '7.3.0' of https://github.com/umbraco/Umbraco-CMS into 7.3.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
 2015-04-01 14:03:05 +11:00
Shannon
924ee5c413 fixes merge 2015-04-01 14:02:14 +11:00
Shannon
bceed10bd8 Merge branch 'dev-v7-distcache' into 7.3.0 2015-04-01 14:00:13 +11:00
Shannon Deminick
dec7ef8f3f Merge pull request #663 from Shazwazza/dev-v7-7.30-AspNetIdentity 
ASP.Net Identity for back office users
 2015-04-01 13:57:37 +11:00
Shannon
f019900619 oops, not sure how the LICENSE got deleted, removed AD identity nuspec since that is in a diff repo now. Removes commented out code in umb module for auth - this is done by cookie middleware now. 2015-04-01 13:55:33 +11:00
Shannon
ad92006f54 Removes the extensibility files and build for identity stuff - that now exists in a separate github repo. 2015-04-01 13:42:43 +11:00
Shannon
439935430a Simple update adding nuspec for Identity AD 2015-04-01 13:42:40 +11:00
Shannon
1de9dbf18c Updates build process to include building a nuget Identity package to provide extensibility points in Umbraco. 2015-04-01 13:42:36 +11:00
Shannon
394cab5ab4 Updates the owin startup classes - we now have a default one shipped as a DLL which will always execute based on the appSettings, then we can ship with 2 optional ones that people can learn and use from which just requires them to update the appSetting. Now to decide on how to ship these .cs files 2015-04-01 13:42:34 +11:00
Shannon
6efd14eff3 Updates the startup auth code extension methods to better support extensibility so people could override the default user store or manager in order to implement some interfaces that we currently don't. 2015-04-01 13:42:31 +11:00
Shannon
e468492064 Updates back office ext methods to include the CallbackPath which is key to make multi-tenanted work and ensures that the back office providers are linked with the umbraco back office external cookie provider. Adds some docs about it too. Updates the web.config templates to ensure the correct assembly redirects. 2015-04-01 13:42:29 +11:00
Shannon
140d3c0268 Update to latest Identity. Moves startup code to App_Start like VS templates have, this will be better for our nuget packages (like i do in UmbracoIdentity which works for both web apps and websites). Updates web.config to explicitly declare the owin startup otherwise we'll end up with conflicts (YSODs) and now people can configure it properly. 2015-04-01 13:42:26 +11:00
Shannon
349cb91e3a updates expires logic 2015-04-01 13:42:24 +11:00
Shannon
abf70cd302 filters external login providers in the back office to only show the ones configured for umbraco back office 2015-04-01 13:42:21 +11:00
Shannon
880c9cf679 Updates back office extensions to use AuthenticationDescriptionOptionsExtension to configure the options for umb back office 2015-04-01 13:42:19 +11:00