Sebastien Ros 428b44a900 Merge branch '1.9.x' into dev ...

Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs

2015-09-04 13:15:43 -07:00

..

Activities

#21294: Added optional date parameter to TimerActivity. Also added description hints and updated class name.

2015-03-24 15:17:30 +01:00

Controllers

Merge branch '1.9.x' into dev

2015-09-04 13:15:43 -07:00

Drivers

#19987: Decoupling worfklows from other modules

2013-08-16 17:23:41 -07:00

Forms

#21294: Added optional date parameter to TimerActivity. Also added description hints and updated class name.

2015-03-24 15:17:30 +01:00

Handlers

#20574: Optimizing transaction log

2014-05-02 10:06:50 -07:00

Helpers

Fix user defined outcome connections in Branching activities - fixes #5686

2015-08-24 16:36:28 +08:00

Models

Fix Issue #4352: Added prompt on workflow save to give choice of stopping running workflows.

2015-08-27 10:59:50 +01:00

Properties

Updating version number 1.9.1

2015-06-23 11:20:06 -07:00

Recipes

Reverted my own stupidity.

2015-08-03 16:44:58 +01:00

Scripts

Fixing that in Workflows localized outcomes were used as identifiers, breaking when a localization package was installed.

2015-05-20 01:31:15 +02:00

Services

#5234 Duplicate lines in WorkflowManager

2015-05-07 21:24:08 +02:00

Styles

#5420: Added stub CSS files for various activities to prevent 404 errors.

2015-06-27 18:47:06 +03:00

Tokens

Fixing signal token url generation.

2014-06-04 13:16:00 +02:00

ViewModels

Making UpdatedActivityModel serializable

2013-10-28 11:47:30 -07:00

Views

Merge branch '1.9.x' into dev

2015-09-04 13:15:43 -07:00

AdminMenu.cs

Adding workflows menu icon.

2013-06-02 11:54:46 +02:00

Migrations.cs

…

Module.txt

Removed mixed tabs and spaces.

2015-07-09 12:29:23 +01:00

Orchard.Workflows.csproj

Refactored Workflows import/export step.

2015-07-17 14:47:31 +01:00

Placement.info

…

ResourceManifest.cs

#19987: Decoupling worfklows from other modules

2013-08-16 17:23:41 -07:00

Web.config

Fixing Visual Studio warnings on web.config files

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