lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,918 Commits 94 Branches 33 Tags
d25eb61fe76a4e737d29ac1cb58ff2655c51ef97
Commit Graph

43 Commits

Author SHA1 Message Date
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Bertrand Le Roy
39b4009e40 Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js 2015-03-20 20:14:37 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
3585f30eb9 Adding Word files to excluded extensions 2014-08-06 15:57:12 -07:00
Jay Harris
f864fdc916 #20846: Allowing None as action in projects 
Work Item:20846
 2014-08-06 12:10:18 -07:00
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07: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
Sebastien Ros
f0851bb5fb Updating version numbers 2013-09-10 14:08:05 -07:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
ab0b8b095d Updating version numbers 
--HG--
branch : 1.x
 2012-05-03 14:58:16 -07:00
Sebastien Ros
e5a5decf7b Updating version numbers 
--HG--
branch : 1.x
 2012-02-29 11:29:55 -08:00
Sebastien Ros
c2b770c916 Updating assembly info 
--HG--
branch : 1.x
 2011-10-03 11:19:57 -07:00
Renaud Paquay
846a40a1fe Update version to generic 1.2.0 
--HG--
branch : 1.x
 2011-05-24 19:49:58 -07:00
Sebastien Ros
4bd3157fe9 #17793: Removing Orchard.Web.cspoj from msdeploy 
Work Items: 17793

--HG--
branch : 1.x
 2011-05-09 14:13:05 -07:00
Renaud Paquay
99e4ed8857 Updating version #s to match 1.0 release 
--HG--
branch : 1.x
 2011-01-17 15:04:57 -08:00
Renaud Paquay
94563832d9 Updating version # to 1.0 
--HG--
branch : 1.x
 2011-01-11 16:47:30 -08:00
Renaud Paquay
8935efc96c Update version # to 0.9.0 
--HG--
branch : dev
 2010-12-13 21:56:39 -08:00
Renaud Paquay
cb8b5f3812 Delete 'Trust Level="Medium"' element for package 
--HG--
branch : dev
 2010-12-06 22:03:10 -08:00
Renaud Paquay
26a0ff06a9 Validate modules/themes project files during build 
We check for a few things:
- MVC2/3 tooling guid
- "None Include" elements (these often happen for .cshtml files)
- Output Path not set to "bin\"
- FxCop ruleset not set to Orchard ruleset (disabled for now)

Work Items: 16821

--HG--
branch : dev
 2010-11-24 11:52:15 -08:00
andrerod
4195010f69 Correcting assemblyinfo's 
--HG--
branch : dev
 2010-11-18 23:50:58 -08:00
Dave Reed
e869a4f467 Fixing some basic fx cop warnings 
--HG--
branch : dev
 2010-11-12 12:47:06 -08:00
Dave Reed
ca74da5ea5 Setting code analysis ruleset to paired down Security rules. 
--HG--
branch : dev
 2010-11-10 16:16:54 -08:00
Renaud Paquay
69f1e13a5f Removing commented code 
--HG--
branch : dev
 2010-10-22 11:45:24 -07:00
Renaud Paquay
8548de19d7 Update project alteration task to support references from "lib" 
In the Orchard.Web.csproj file for WebPI, we need to reference all
assemblies coming from our "lib" folder to point to the "bin" folder
of the deployed app.

--HG--
branch : dev
 2010-10-22 11:44:34 -07:00
Nathan Heskew
9fc9e5287e Adding another null check to the FilterModuleBinaries msbuild task 
--HG--
branch : dev
 2010-10-20 00:17:55 -07:00
Nathan Heskew
d329722c62 Updating the packing build to put themes in their place 
--HG--
branch : dev
 2010-10-20 00:07:53 -07:00
Renaud Paquay
4f049161ce Change version # to 0.8.0 
--HG--
branch : dev
 2010-10-16 09:37:42 -07:00
BertrandLeRoy
9f438da24a Changing copyright notices to reflect new name of the Foundation. 
--HG--
branch : dev
 2010-10-01 17:38:57 -07:00
Renaud Paquay
2b7a604ea7 Remove unused fields 
--HG--
branch : dev
 2010-07-19 14:08:03 -07:00
Renaud Paquay
4bd6abe055 Replacing all version# with 0.5.0 
--HG--
branch : dev
 2010-07-19 14:04:53 -07:00
Renaud Paquay
b4da079a66 Add target to msbuild file to set a version# in module.txt files 
--HG--
branch : dev
 2010-07-19 13:38:35 -07:00
Renaud Paquay
510621f1bc Update MsDeploy package to include module binaries 
--HG--
branch : dev
 2010-07-16 18:17:34 -07:00
Renaud
ef34e58ed5 A few more changes related to .NET 4.0 port 
--HG--
branch : dev
 2010-05-22 16:48:08 -07:00
Renaud Paquay
1af2d3717c Move project to .net 4.0 
Also cleanup assemblyinfo files

--HG--
branch : net40
 2010-05-21 22:23:26 -07:00
Renaud Paquay
030c93be8e Convert solution/projects to dev10 and target .net 40 
--HG--
branch : net40
 2010-05-06 10:28:29 -07:00
Anthony Steele
4b96ede0be Removed unneeded project references and using statements 2010-04-07 21:40:16 +01:00
Louis DeJardin
17d063fa21 Post-processing the compiled web project 
Custom msbuild task performs heavy lifting over csproj xml
Project references are changed to file references, additional content files are added, and code files are copied over

--HG--
branch : dev
 2010-02-08 01:09:38 -08:00