Commit Graph

11 Commits

Author SHA1 Message Date
Hermes Sbicego
3bda4acee1 [#7396] Implements UnassignRoleActivity (#7414)
Fixes #7396
2016-12-08 13:05:18 -08:00
Matthew Harris
5cc0acae44 [Fixes #7299] Update defaults for rebracer.xml (#7300)
Fixes #7299
2016-10-13 12:20:36 -07:00
Sebastien Ros
d39485abf2 Merge branch '1.9.x' into 1.10.x
Conflicts:
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Rebracer.xml
2016-03-17 10:18:46 -07:00
Sebastien Ros
c4dd5a9e18 Updating Rebracer settings 2016-03-16 16:34:45 -07:00
Sebastien Ros
bb5c6e2ed1 Ignoring Rebracer changes
Line orders would change randomly
2016-01-14 09:40:26 -08:00
Sebastien Ros
a0c61c0328 Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
2016-01-14 08:50:24 -08:00
Sebastien Ros
fe121a81f1 [Fixes #5728] Adding default grid system to TheThemeMachine
Breaking change: Existing themes relying on Layout and TheThemeMachine
will need to add a reference to this css.
2016-01-13 15:47:39 -08:00
Lombiq
37b97eaa26 Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder 2015-12-22 21:57:25 +01:00
Sebastien Ros
cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07:00
Lombiq
c8f65e7110 Updating Rebraces config for VS Update 4 2015-02-12 00:12:11 +01:00
Lombiq
a05ef10322 #20520: Adding Rebracer config file to automatically set the conventional brace styling
Work Item: 20520
2015-01-15 20:19:47 +01:00