Commit Graph

24 Commits

Author SHA1 Message Date
Daniel Stolt
3f6fc4899e Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-19 22:49:15 +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
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Rob King
86fd4a0df5 Moved NHibernate to NuGet. Version change: None 2015-12-04 18:06:08 +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
Sebastien Ros
f1cd6aa38d Merge branch '1.9.x' into dev
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
2015-10-15 15:07:19 -07:00
Erik Scofield
7fb63fd9eb Fix incorrect project reference probably from a merge from the Naxos branch to this feature. 2015-10-09 11:08:15 -05:00
Erik Scofield
59d95f11ee Enhancement to allow multi-select for the content picker 2015-09-23 00:11:43 -05: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
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
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
Sipke Schoorstra
e6d83b57bd #20012: Refactoring content picker field view and script to a shape for re-usability.
Work Item: 20012
2013-08-15 15:40:32 -07:00
Nicholas Mayne
1886ee7472 Fixing path to NHibernate in Orchard.ContentPicker. I referenced the wrong place.
--HG--
branch : 1.x
2013-03-20 00:07:39 +00:00
Nicholas Mayne
9474ea2dc4 Fixing references in Orchard.ContentPicker.
--HG--
branch : 1.x
2013-03-19 20:07:58 +00:00
Sebastien Ros
875b28b6c5 #19515: Moving ContentMenuItemPart to Content.Picker
Work Item: 19515

--HG--
branch : 1.x
2013-03-13 12:08:00 -07:00
Sebastien Ros
34a2caddad Adding missing icon in Content Picker
--HG--
branch : 1.x
2013-02-12 14:25:36 -08:00
Sebastien Ros
babdd75b3e Fixing some AssemblyInfo.cs files which where not compiled
--HG--
branch : 1.x
2012-11-09 11:00:20 -08:00
Sebastien Ros
60760c6130 #19046: Moving content-picker-admin.css to Content Picker module
Work Item: 19046

--HG--
branch : 1.x
2012-09-26 17:30:46 -07:00
Sebastien Ros
e1d6a6cad4 Including Orchard.ContentPicker
--HG--
branch : 1.x
2012-08-22 15:35:45 -07:00