Lombiq 5a6b56cc72 Merge branch '1.10.x' into dev ...

# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config

2017-12-22 21:05:17 +01:00

..

Controllers

#6410 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files.

2016-03-22 21:19:50 +01:00

Descriptors

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Drivers

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Handlers

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

Media

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Models

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Properties

Updating version number

2017-04-03 12:21:56 -07:00

Providers/Filters

[Fixes #7815] Orchard.MediaProcessing, adds scale option to resize filter (#7816)

2017-08-17 12:07:51 -07:00

Scripts

Cleaned up and reformatted all Web.config files according to #6072.

2016-01-22 20:38:34 +01:00

Services

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Shapes

fix typo of occured for logging messages and notification (#7083)

2016-08-15 14:25:41 +02:00

Styles

Cleaned up and reformatted all Web.config files according to #6072.

2016-01-22 20:38:34 +01:00

ViewModels

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Views

add the lack of file of Parts.MediaProcessing.ImageProfile.cshtml

2016-02-10 21:30:18 -05:00

AdminMenu.cs

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Migrations.cs

Adding WithIdentity() content metadata helper to add IdentityPart in migrations and changing affected code to use this

2016-01-04 19:09:00 +01:00

Module.txt

Updating version number

2017-04-03 12:21:56 -07:00

Orchard.MediaProcessing.csproj

5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892)

2017-12-21 12:49:53 -08:00

packages.config

5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892)

2017-12-21 12:49:53 -08:00

Placement.info

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Web.config

Extension web.configs: Specifying DotNetCompilerPlatform DLL version and removing language version restriction (as it's meaningless)

2017-12-22 20:42:27 +01:00