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,099 Commits 83 Branches 32 Tags
d63a9ed9d1e6f3e3d1b36975bab1c8274457e534
Commit Graph

72 Commits

Author SHA1 Message Date
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
Daniel Stolt
e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -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
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -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
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
e89012790f Refactoring Media files 
- Moving Media Fields to Media Picker
- Enabling Media Library in default recipe
- Integrating TinyMce module only if features are enabled
- Disabling Media Picker in new installs

--HG--
branch : 1.x
 2013-06-10 17:43:53 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
6a14aa405c Disabling cache 
--HG--
branch : NH3
 2012-07-11 10:02:32 -07:00
Sebastien Ros
f87d48a324 #18655: Removing Orchard.Experimental module 
Work Item: 18655

--HG--
branch : 1.x
 2012-06-26 17:57:18 -07:00
Sebastien Ros
696cc68191 Adding multiple content item selection in ContentPickerField 
--HG--
branch : 1.x
 2012-06-01 15:26:21 -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
67f9c6c569 Fixing project file 
--HG--
branch : 1.x
 2012-02-13 10:29:59 -08:00
randompete
fa6cd868b4 Removed HomePage, further references to Routable, and IBlogPathConstraint. 
--HG--
branch : autoroute
 2011-12-29 15:43:13 +00:00
Sebastien Ros
6493138264 Updating profiling readme 
--HG--
branch : 1.x
 2011-12-19 12:10:48 -08:00
Sebastien Ros
63c2ac7d98 Fixing unit tests for CI 
--HG--
branch : 1.x
 2011-11-29 11:29:50 -08:00
Sebastien Ros
c2b770c916 Updating assembly info 
--HG--
branch : 1.x
 2011-10-03 11:19:57 -07:00
Sebastien Ros
1eb7993111 Enabling Title feature by default 
--HG--
branch : 1.x
 2011-09-20 16:44:20 -07:00
Renaud Paquay
846a40a1fe Update version to generic 1.2.0 
--HG--
branch : 1.x
 2011-05-24 19:49:58 -07:00
Suha Can
0b3fb811ad Fixing merge errors and side effects. 
--HG--
branch : dev
 2011-02-22 18:17:17 -08: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
Suha Can
c97a8d26cb Cleanup (includes) 
--HG--
branch : dev
 2010-12-07 15:47:45 -08:00
Louis DeJardin
733de4a166 Adding a component to experimental module to capture ioc costing 
--HG--
branch : perf
extra : rebase_source : aa936df6717501a84fafce41f8130ced8217fa42
 2010-11-30 13:46:13 -08:00
Suha Can
dafca60524 Merge dev -> perf 
--HG--
branch : perf
 2010-11-29 11:59:11 -08:00
Renaud Paquay
69951673af Add Orchard.Scripting.Lightweight as a default feature 
--HG--
branch : dev
 2010-11-28 12:09:11 -08:00
Louis DeJardin
540723d492 Perf - updating profiling specflow test 
Doing 4 groups of 10, to see get a sense of variance

--HG--
branch : perf
 2010-11-24 18:53:47 -08:00
Louis DeJardin
0ff15f262a Updating profiling build target 
--HG--
branch : perf
 2010-11-24 15:09:25 -08:00
Renaud Paquay
4f95fc4a4c Merge perf => dev 
--HG--
branch : dev
 2010-11-21 12:27:22 -08:00
Andre Rodrigues
53bddd53d9 Fixing Widget / Scripting / Framework dependency loading. 
--HG--
branch : dev
 2010-11-20 15:38:56 -08:00
andrerod
4195010f69 Correcting assemblyinfo's 
--HG--
branch : dev
 2010-11-18 23:50:58 -08:00
Renaud Paquay
b43f30be15 Merge dev => perf 
--HG--
branch : perf
 2010-11-15 16:23:24 -08:00
Louis DeJardin
30191928b5 Incremental improvement to extension manager 
--HG--
branch : perf
extra : rebase_source : f2697bf60ab12c79e848e1794652e19ac5933d3a
 2010-11-12 18:58:35 -08:00
Dave Reed
e869a4f467 Fixing some basic fx cop warnings 
--HG--
branch : dev
 2010-11-12 12:47:06 -08:00
Renaud Paquay
2f8425c9cb Add "Messaging" as a default enabled feature 
Fixes profiling build

--HG--
branch : perf
 2010-11-13 09:49:01 -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
Sébastien Ros
278b12f55b Adapting PublishLater dependencies and tests 
--HG--
branch : dev
 2010-10-25 19:53:16 -07:00