Sebastien Ros d0b364c28e Merge branch '1.9.x' into dev ...

Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config

2015-09-30 15:57:34 -07:00

..

Activities

#20586: Fixing Form Submitted activity

2014-03-29 10:48:11 -07:00

Controllers

#20586: Fixing Form Submitted activity

2014-03-29 10:48:11 -07:00

Drivers

Refactoring Import methods

2015-08-28 17:06:34 -07:00

Handlers

Including Orchard.CustomForms

2012-08-22 15:36:04 -07:00

Models

#20250: Allowing user to change the text of the submit button on custom forms.

2014-07-19 19:02:33 +01:00

Properties

Bumping version number

2015-09-23 17:23:54 -07:00

Rules

Fixing CustomFormEvents (dictionary lookups are case sensitive).

2013-06-29 18:01:56 +02:00

Scripts

remove webpages:enabled from scripts and content folders

2013-12-04 11:55:57 -08:00

Security

Removed JetBrains attributes from code base and removed suppression of CS0436 compiler warning.

2015-03-21 15:38:35 +01:00

Styles

remove webpages:enabled from scripts and content folders

2013-12-04 11:55:57 -08:00

ViewModels

Including Orchard.CustomForms

2012-08-22 15:36:04 -07:00

Views

Fixing that Custom Forms didn't display a submit button text if there was none configured

2015-06-15 00:07:01 +02:00

AdminMenu.cs

#20032: Adding a custom Form Submitted activity

2013-08-20 15:08:04 -07:00

Migrations.cs

Merge branch '1.x' into feature/audittrail

2014-07-23 19:03:28 -07:00

Module.txt

Merge branch '1.9.x' into dev

2015-09-30 15:57:34 -07:00

Orchard.CustomForms.csproj

Merge branch '1.9.x' into dev

2015-06-18 10:35:06 -07:00

Permissions.cs

#20534: Fixing custom form permissions.

2014-03-28 16:40:41 +01:00

Placement.info

Including Orchard.CustomForms

2012-08-22 15:36:04 -07:00

Web.config

Fixing Visual Studio warnings on web.config files

2015-08-27 11:11:10 -07:00