Lombiq dc772cf893 Merge remote-tracking branch 'origin/1.x' into feature/owin ...

Conflicts:
	src/Orchard.Web/Web.config
	src/Orchard/Orchard.Framework.csproj

2014-10-27 17:01:00 +01:00

..

Orchard

Merge remote-tracking branch 'origin/1.x' into feature/owin

2014-10-27 17:01:00 +01:00

Orchard.Azure

Upgrading Azure solution references

2014-08-15 14:50:31 -07:00

Orchard.Azure.Tests

Fixing Azure unit tests

2013-09-06 15:45:21 -07:00

Orchard.Core.Tests

Revert "#20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either." This actually causes "Instances cannot be resolved and nested lifetimes cannot be created from this LifetimeScope as it has already been disposed." errors.

2014-10-08 15:22:56 +02:00

Orchard.Profile

Upgrading to .NET Framework 4.5.1

2014-08-13 14:07:45 -07:00

Orchard.Specs

Merge branch '1.8.x' into 1.x

2014-10-23 20:53:47 -07:00

Orchard.Tests

Merge remote-tracking branch 'origin/1.x' into feature/owin

2014-10-27 17:01:00 +01:00

Orchard.Tests.Modules

Fixing reference to Castle in Orchard Tests

2014-10-13 13:52:38 +01:00

Orchard.WarmupStarter

Upgrading to .NET Framework 4.5.1

2014-08-13 14:07:45 -07:00

Orchard.Web

Merge remote-tracking branch 'origin/1.x' into feature/owin

2014-10-27 17:01:00 +01:00

Orchard.Web.Tests

Upgrading to .NET Framework 4.5.1

2014-08-13 14:07:45 -07:00

Tools

Upgrading to .NET Framework 4.5.1

2014-08-13 14:07:45 -07:00

Orchard.4.5.resharper

…

Orchard.5.0.ReSharper

…

Orchard.sln

Fixed solution file and corrected namespace in Orchard.Redis

2014-10-15 09:45:06 +02:00

OrchardBasicCorrectness.ruleset

…

OrchardSecurity.ruleset

…

Shapes.txt

…

Zones.txt

…