lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 19:17:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,146 Commits 84 Branches 32 Tags
8036e539b611c16507dcfe0645e67490c78fd57d
Commit Graph

259 Commits

Author SHA1 Message Date
Piotr Szmyd
eb38abcc31 Fixing build warnings. Added binding redirects for JSON.NET 6.0 2014-07-15 14:23:43 +02:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Erik Oppedijk
ef7318fa58 remove webpages:enabled from scripts and content folders 2013-12-04 11:55:57 -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
5805f0ad9b Repair intellisense, update references 2013-12-04 11:54:34 -08:00
Sebastien Ros
6c0b85ad74 Merge branch 'master' into 1.x 
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
 2013-11-11 18:11:53 -08:00
Sebastien Ros
7afb052e7c Updating version numbers 2013-11-08 16:53:03 -08:00
Sebastien Ros
f6f6a56c24 Merge branch 'feature/fw45' into 1.x 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config
 2013-10-11 16:40:44 -07:00
Sipke Schoorstra
6085d8cb15 Implementing a consistent usage of 'text', 'text small', 'text medium' and 'text large'. 
Yes, it's the little things in life.
 2013-09-14 16:00:42 -07:00
Sebastien Ros
f0851bb5fb Updating version numbers 2013-09-10 14:08:05 -07:00
Erik Oppedijk
26c45498df Remove unused assemblybinding redirect (mvc 2 to 3 redirect) from views folder 2013-08-27 22:07:42 +02:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Erik Oppedijk
65eb63d29d Update all MVC references to 4.0 and Razor to 2.0 2013-08-20 10:39:13 +02:00
Erik Oppedijk
b49b65636f remove IIS6 settings 2013-08-15 17:14:39 -07:00
Sipke Schoorstra
d951706364 #19924: Adding back obsolete FormValueRequiredAttribute to the Orchard.Core.Contents.Controllers namespace to prevent 3rd party modules from failing to compile that still use this attribute. 
--HG--
branch : 1.x
 2013-07-24 22:37:35 +02:00
Sipke Schoorstra
42e2eb630e #19924: Moving FormValueRequiredAttribute to Orchard.Mvc, removing duplicate class declarations and updating usages. 
Work Item: 19924

--HG--
branch : 1.x
 2013-07-21 02:03:40 +02:00
Sebastien Ros
2889d29498 Refactoring the Media Library 
- Removed dependency on Orchard.Taxonomies
- Removed dependency on Orchard.Media

You will need to remove the Orchard_MediaLibrary tables and also
the Data Migration record corresponding to this module if you want to upgrade
from 1.x. You can also apply the database changes by hand, remove all the
records then use the Upgrade module to import all media.

--HG--
branch : 1.x
extra : rebase_source : 46100428d9546c3082bf65ce85d8d891543dc0a9
 2013-07-02 18:10:43 -07:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
109da3a297 Implementing Media Library module 
--HG--
branch : 1.x
 2013-04-18 10:59:15 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
3fe70aa33c #18975: Maintaining current folder in media management 
Work Item: 18975

--HG--
branch : 1.x
 2012-09-20 10:09:11 -07:00
Sebastien Ros
e33eb89e80 #18832: Overwrite files when unzipping a media folder 
Work Item: 18832

--HG--
branch : 1.x
 2012-09-19 17:20:58 -07:00
Sebastien Ros
cd7fb75f65 Replacing SharpZipLib by DtoNetZip 
--HG--
branch : 1.x
 2012-09-05 18:47:59 -07:00
agriffard@hotmail.com
a204025491 #18863: Orchard.Media : MetaWeblogNewMediaObject doesn't delete a file without directory name 
--HG--
branch : 1.x
 2012-08-23 13:30:47 +02:00
Sebastien Ros
a3e6916bdd #18917: Upgrading solution file to Visual Studio 11 
Work Item: 18917

--HG--
branch : 1.x
 2012-08-15 10:14:09 -07:00
Bertrand Le Roy
55127c80f6 Added thumbnails for pictures in media folder view. 
--HG--
branch : 1.x
 2012-08-12 18:02:02 -07:00
Bertrand Le Roy
9d0cc7b3a5 Not breaking media editor for images, and refactoring into ext method. 
--HG--
branch : 1.x
 2012-08-12 17:17:08 -07:00
Bertrand Le Roy
7e3453d26e Adding link to media from media editor in case it's not indetified as an image. 
--HG--
branch : 1.x
 2012-08-12 17:04:42 -07:00
Bertrand Le Roy
abf5b279dd Making edit media screen suck less for non-images. 
--HG--
branch : 1.x
 2012-08-12 15:57:30 -07:00
Sebastien Ros
091e16b33b Updating version numbers 
--HG--
branch : 1.x
 2012-07-07 15:09:56 -07:00
Sebastien Ros
ab0b8b095d Updating version numbers 
--HG--
branch : 1.x
 2012-05-03 14:58:16 -07:00
Sebastien Ros
326c8df745 Removing security attributes conflicting with dynamic compilation. 
BuildManager.GetCompiledAssembly will generate an AssemblyInfo.cs file which
will get compiled with the project, but create a conflict as two SecurityRules
attributes can't be defined at the same time. For VS 11 Beta compatibility.

--HG--
branch : 1.x
 2012-04-23 12:30:01 -07:00
Sebastien Ros
6ed1b88f17 Replacing [SecurityTransparent] by [SecurityRules(SecurityRuleSet.Level2)] 
--HG--
branch : 1.x
extra : rebase_source : 87b17cd15d51603bc6f39f01c911b414aa6428cb
 2012-03-14 11:27:02 -07:00
Sebastien Ros
e5a5decf7b Updating version numbers 
--HG--
branch : 1.x
 2012-02-29 11:29:55 -08:00
EddieDesk
22bd594102 #18414: Fixing BloggerPlus support in XmlRpc 
Work Item: 18414

--HG--
branch : 1.x
 2012-02-09 13:01:24 -08:00
Sebastien Ros
81eac32945 Adding static content client cache defaults 
--HG--
branch : 1.x
 2012-01-12 15:28:16 -08:00
Sebastien Ros
a1802afe3a Updating web.config files for Resharper compatibility 
--HG--
branch : 1.x
 2012-01-04 11:15:31 -08:00
Sebastien Ros
b89af32189 Adding more confirmation dialogs 
--HG--
branch : 1.x
 2011-12-15 16:37:46 -08:00
ldhertert
b72e486fe9 #18153: Checkign allowed media files extensions from the client 
Work Item: 18153

--HG--
branch : 1.x
 2011-12-02 17:12:42 -08:00
Sebastien Ros
198a8283eb #17789, #18166: Resizing image in a Blog Post fails from Live Writer 
Work Items: 18166, 17789

--HG--
branch : 1.x
 2011-11-29 11:10:17 -08:00
Suha Can
95c0ac69e6 IExceptionPolicy concept and default implementation. 
Updating EventBus and UnhandledExceptionFilter to use the exception policy.
Adding OrchardFatalException.
Updating text on default error page.
(Part II) Removing the unhandled "catch" from module controllers. If there are "expected" exceptions, move them closer to the APIs where they occur.
Removing ControllerExtensions.Error and refactoring.

--HG--
branch : 1.x
extra : transplant_source : %5C9a%E2%9A%F4%ACI%A3F%3C%D2%5C%CC%5C%9A.%E1%EF%3C
 2011-06-09 16:34:31 -07:00
Suha Can
d83d922a6b (Part I) Removing the unhandled "catch" from module controllers. If there are "expected" exceptions, move them closer to the APIs where they occur. 
--HG--
branch : 1.x
extra : transplant_source : %C9q%EC%E3%C3%E3%98QL%27%2B%D68%A9x%DD%40J%93A
 2011-06-08 16:26:58 -07:00
Sebastien Ros
c2b770c916 Updating assembly info 
--HG--
branch : 1.x
 2011-10-03 11:19:57 -07:00
Sebastien Ros
5c5f546317 #18106, #18061: Fixing XmlRpc urls 
Work Items: 18061, 18106

--HG--
branch : 1.x
 2011-09-25 15:03:01 -07:00
Suha Can
92dee031fd Merge integration -> contributions. 
--HG--
branch : contributions
 2011-06-13 13:52:52 -07:00
Sebastien Ros
2138cbdddd Forcing <Private>True</Private> in all projects. True might not be the default on 
all systems.

--HG--
branch : 1.x
 2011-06-09 16:25:39 -07:00
Suha Can
7dbc363757 Merge integration -> contributions. 
--HG--
branch : contributions
 2011-06-07 11:19:34 -07:00
Renaud Paquay
846a40a1fe Update version to generic 1.2.0 
--HG--
branch : 1.x
 2011-05-24 19:49:58 -07:00
Dave Reed
7224c10658 #17708: Media views use bad translations 
--HG--
branch : 1.x
 2011-05-12 14:51:41 -07:00