Sebastien Ros
eee341696d
Merge branch '1.10.2' 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.Indexing/Services/IndexingTaskExecutor.cs
# src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
# src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
2017-04-03 11:54:43 -07:00
Benedek Farkas
185ad6b1eb
Adding LangVersion 5 setting to each csproj's Debug and Release target ( #7641 )
...
Fixes #7639
2017-04-03 10:38:41 -07:00
Daniel Stolt
28425b0a53
Retargeted NuGet references to targetFramework="net452". Fixes #6406 .
2016-02-20 01:13:13 +01:00
Daniel Stolt
3f6fc4899e
Retargeted NuGet references to targetFramework="net452". Fixes #6406 .
2016-02-19 22:49:15 +01:00
Daniel Stolt
56dad4da2a
Merge branch '1.10' into 'dev'.
2016-02-13 13:23:33 +01:00
Lombiq
f3afc4110a
Removing empty folders in several project files
2016-02-10 22:45:25 +01:00
Sebastien Ros
a14b006d70
Merge branch '1.9.3' into 1.10
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
src/Orchard/ContentManagement/DefaultContentManager.cs
2016-02-01 09:36:47 -08:00
Lombiq
6da6e7071a
Removing unneeded System.Data.DataSetExtensions from Tokens that could cause assembly loading errors and flood the logs
2016-01-21 00:35:42 +01:00
Daniel Stolt
dec68d454c
Updated code base to target .NET Framework 4.5.2. Fixes #5700 .
2016-01-14 01:06:32 +01:00
Rob King
74d8cf8e9a
Line endings resolution
2015-12-15 11:55:23 +00:00
Lombiq
5406b17601
Converting all files stored as CRLF in git to be stored as LF
...
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
2015-12-13 22:21:02 +01:00
Rob King
3f72249654
Moved System.Web.Mvc to NuGet. Version change: None
2015-12-07 20:46:05 +00:00
Lombiq
680a9eb85b
Fixing that some files had line endings mixed up (both LF and CRLF)
2015-12-03 00:10:12 +01:00
Jeff
423fec90b3
Issue #3402 : Implemented List tokens.
2015-09-29 11:05:38 +01:00
Sipke Schoorstra
ca4fb40bdf
Merge branch 'dev' into feature/dashboard
2015-06-27 12:12:01 +03:00
Sebastien Ros
6d58498b82
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard/Localization/Text.cs
2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2
Updating ruleset location for all projects
2015-06-16 16:22:04 -07:00
Sipke Schoorstra
f84361d231
Implemented a UrlHelper token provider.
...
This enables users to create hyperlinks based on route values that are dynamically turned into actual urls.
2015-05-20 18:55:28 +02:00
Kees Damen
2cfcdfaa8b
Fixed project references to Orchard.Core and Orchard.Framework
2015-04-16 16:23:12 +02:00
Sebastien Ros
221197f314
Upgrading to .NET Framework 4.5.1
2014-08-13 14:07:45 -07:00
Sebastien Ros
2574b87bdf
Implementing a tokens html filter
2014-06-11 15:04:28 -07:00
Sebastien Ros
844edbbc27
Creating a feature for RssPart
2014-03-03 15:49:53 -08:00
Sebastien Ros
b2d7fa7fde
Implementing RssPart
2014-02-28 14:40:55 -08:00
Sebastien Ros
442cf93488
Refactoring Orchard.Templates
...
Extracting the shape rendering logic into the framework. The
module is only responsible for managing templates and
the template languages. IShapeDisplay is introduced to render
a shape.
2014-01-10 17:36:02 -08:00
Erik Oppedijk
3061412961
Delete views/web.config and update webpages to 3.0
2013-12-04 11:55:54 -08:00
Erik Oppedijk
8e84bd57e7
Upgrade projects and web.config to 4.5 FW
2013-08-23 15:16:14 +02:00
Sebastien Ros
f2bb3ee47a
Including Orchard.Tokens
...
--HG--
branch : 1.x
2012-08-22 15:43:10 -07:00
