lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,029 Commits 84 Branches 32 Tags
2c45b9b13eb8d65123f5ad63ce5e64b569d818b7
Commit Graph

183 Commits

Author SHA1 Message Date
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
Bing Huan Chio
0395d33f71 Updated UT and displaying last updated by correctly 2015-04-22 18:42:07 -07:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Daniel Stolt
fac9080326 Removed JetBrains attributes from code base and removed suppression of CS0436 compiler warning. 2015-03-21 15:38:35 +01:00
Zoltán Lehóczky
872a1de928 Revert "#20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either." This actually causes "Instances cannot be resolved and nested lifetimes cannot be created from this LifetimeScope as it has already been disposed." errors. 
This reverts commits 411e3f9ddd and b21d637ba4.
 2014-10-08 15:22:56 +02:00
Lombiq
b21d637ba4 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-08 13:43:47 +02:00
Lombiq
0440d866e2 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-03 13:39:52 +02:00
Sebastien Ros
1b18621e00 Revert "Removing DefaultContentManagerSession" 
This reverts commit 262c825c26.
 2014-08-27 18:29:11 -07:00
Sebastien Ros
262c825c26 Removing DefaultContentManagerSession 2014-08-27 12:09:18 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
2432b7f326 Fixing invalid BBcode filter state 2014-04-17 12:50:09 -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
c0ae3f420e Migrating SiteSettingsPart 2013-11-12 17:51:26 -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
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
7d19c8de7a Reverting comments filters changes 
--HG--
branch : 1.x
 2013-07-10 17:07:46 -07:00
Sebastien Ros
52f43ce80e Fixing content type records caching 
When a content type is created during a rolled back transaction, the cache
would hold a wrong id.

--HG--
branch : 1.x
extra : rebase_source : 756907c69eb0ce5f1f66a6ed204841fdab24cfd1
 2013-06-28 17:21:10 -07:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
4feb575e3a #19684: Fixing cartesian products query when loading content type definitions 
Using FetchMany on multiple levels would do LEFT JOIN, creating an exponential
amount of rows, and also duplicating root records. The solution is to separate
this is two calls instead. Another solution would have been to use a
DistinctRootTransformer, but this would not have fixed the records issue.

Work Item: 19684

--HG--
branch : 1.x
 2013-05-06 10:30:08 -07:00
Sebastien Ros
174691c28b Improving eager loading and caching for ContentDefinitionManager 
--HG--
branch : 1.x
 2013-05-03 18:24:13 -07:00
Sebastien Ros
c6ac96a23a Refactoring content type cache 
--HG--
branch : 1.x
 2013-04-25 12:44:28 -07:00
Sebastien Ros
6dd36f5107 Fixing unit tests 
--HG--
branch : 1.x
 2013-04-23 12:00:44 -07:00
Sebastien Ros
be65b3a7eb Refactoring how default page classes are injected 
--HG--
branch : 1.x
 2013-02-28 12:56:50 -08:00
Sebastien Ros
fca554ddc9 Merge with clayless 
--HG--
branch : 1.x
 2013-02-04 10:51:21 -08:00
Sebastien Ros
a9f1312b88 Removing clay usage in favor or pre-configured dynamic objects 
--HG--
branch : clayless
extra : rebase_source : fe1f730585d0df763d4dd4215b11bace48bcd944
 2012-11-20 17:21:52 -08:00
Sebastien Ros
bf46e56b86 Fixing NHibernate references 
--HG--
branch : 1.x
 2012-11-14 16:19:57 -08:00
Sebastien Ros
171a163a8a Adding support for html filters on comments 
--HG--
branch : 1.x
extra : rebase_source : cb25657e65a761bab674e4f175ad38327c46a278
 2012-11-02 16:12:59 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
fcf0b58377 Fixing Bbcode unit tests 
--HG--
branch : 1.x
 2012-08-10 10:27:32 -07:00
Sebastien Ros
09e8bb1a34 Adding missing file 
--HG--
branch : 1.x
 2012-08-09 18:14:29 -07:00
Sebastien Ros
4630269e60 Optimizing Bbcode filter 
--HG--
branch : 1.x
 2012-08-09 18:14:19 -07:00
Sebastien Ros
9bed7cbaba Upgrading NH3 
--HG--
branch : NH3
 2012-07-10 16:01:46 -07:00
Sebastien Ros
3584d1f1f0 Fixing unit tests 
--HG--
branch : 1.x
 2012-07-05 17:17:11 -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
randompete
953a15a1bf Merge 1.x 
--HG--
branch : autoroute
 2011-12-31 04:26:55 +00:00
Sebastien Ros
9472dd9d5e #18313: Updating autofac 
Work Item: 18313

--HG--
branch : 1.x
 2011-12-29 13:55:51 -08:00
randompete
ae27eb1e21 Remove Routable module 
--HG--
branch : autoroute
 2011-12-29 14:36:57 +00:00
randompete
7c944ccf18 Cut all ties to Routable module 
--HG--
branch : autoroute
 2011-12-29 14:36:39 +00:00
randompete
d4218ee98f Removing further RoutePart references and fixing some tests 
--HG--
branch : autoroute
 2011-12-08 01:08:12 +00:00
Sebastien Ros
e566a0e956 Fixing unit tests 
--HG--
branch : 1.x
 2011-11-22 12:24:05 -08:00
Sebastien Ros
f9ffc95964 Fixing references to SqlCe library 
--HG--
branch : 1.x
 2011-11-04 10:48:35 -07:00
Sebastien Ros
73d44afb2c Removing IMapper (backport) 
--HG--
branch : 1.x
 2011-10-05 13:59:24 -07:00