lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,216 Commits 83 Branches 32 Tags
9e57785e4a1ae090ca812a674a84ff5b07a2c917
Commit Graph

123 Commits

Author SHA1 Message Date
Rob King
6df007561d Moved NUnit to NuGet. Version change: 2.5.2.9222 >>> 2.5.10.11092 2015-12-04 11:27:42 +00:00
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
 2015-09-30 15:57:34 -07:00
Sebastien Ros
1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
Sebastien Ros
1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
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
Lombiq
db0c8c3d1f Changing all Codeplex issue links to GitHub links 2015-04-15 21:00:20 +02: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
Daniel Stolt
d5c3a0e59f Fixed an error while publishing via MSBuild (outside of VS). 
When running the Publish target using MSBuild (rather than VS) the error MSB3030 occurs because the manifest file Orchard.exe.manifest cannot be found. This fixes that error, making it possible to automate publishing outside VS, for example using PowerShell.
 2015-02-19 19:03:16 +01: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
35d2a6c8fd #20577: Fixing Orchard.Templates 
Work Item: 20577
 2014-03-26 12:21:51 -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
85d86b0623 #19745: usage of Environment.CurrentDirectory 
Work Item: 19745
 2013-08-16 11:28:26 -07: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
TheMonarch
82bb050eaf #18349: Increasing input size for orchard.exe 
Work Item: 18349

--HG--
branch : 1.x
 2012-01-13 16:15:59 -08:00
Sebastien Ros
c2b770c916 Updating assembly info 
--HG--
branch : 1.x
 2011-10-03 11:19:57 -07:00
andrerod@andrerod-dev1.redmond.corp.microsoft.com
29650f189e #18112: Removing incorrect security attribute 
--HG--
branch : 1.x
 2011-09-13 10:38:26 -07:00
Renaud Paquay
3bcbcb4f04 #17920: Fix multi-threading issue 
Work Item: 17920

--HG--
branch : 1.x
 2011-06-09 08:38:16 -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
f69c47b544 Merge default => dev 
--HG--
branch : dev
 2010-12-11 14:19:15 -08:00
Renaud Paquay
43082540bb Fix unit test 
--HG--
branch : dev
 2010-12-10 23:49:27 -08:00
Renaud Paquay
9e0387c76a Remove all traces of "default.aspx" 
--HG--
branch : dev
 2010-12-10 21:42:57 -08:00
Suha Can
c97a8d26cb Cleanup (includes) 
--HG--
branch : dev
 2010-12-07 15:47:45 -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
Andre Rodrigues
d6d6dcf138 #16767: Delete "PackageReferenceImplementation" project 
--HG--
branch : dev
 2010-11-21 07:44:39 -08:00
Andre Rodrigues
f815a69368 Terminating console if error happens in initialization. 
--HG--
branch : dev
 2010-11-19 00:56:45 -08:00
Andre Rodrigues
e37954f22e Removing some magic numbers 
--HG--
branch : dev
 2010-11-19 00:50:34 -08:00
andrerod
4195010f69 Correcting assemblyinfo's 
--HG--
branch : dev
 2010-11-18 23:50:58 -08:00
Andre Rodrigues
7dfd034a16 Removing unecessary file. 2010-11-17 12:36:44 -08:00
Andre Rodrigues
8328850ccb Medium Trust: Making console run under full trust. 2010-11-17 12:30:36 -08:00
Dave Reed
e869a4f467 Fixing some basic fx cop warnings 
--HG--
branch : dev
 2010-11-12 12:47:06 -08:00