lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 02:44:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,188 Commits 84 Branches 32 Tags
3d37ded6b02d934c6f98e7f72a29b129fc53abc4
Commit Graph

216 Commits

Author SHA1 Message Date
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
Sebastien Ros
c2b770c916 Updating assembly info 
--HG--
branch : 1.x
 2011-10-03 11:19:57 -07:00
Sebastien Ros
45e6cf723b Fixing unit tests 
--HG--
branch : 1.x
 2011-09-27 10:35:50 -07:00
Sebastien Ros
b834744ff9 #16476: Adding delete content types and parts actions 
Work Items: 16476

--HG--
branch : 1.x
 2011-09-13 14:25:12 -07:00
Sebastien Ros
3f73a0b938 Optimizing rendering 
--HG--
branch : 1.x
 2011-08-24 15:35:26 -07:00
Renaud Paquay
1c400dbd69 Merge 
--HG--
branch : 1.x
 2011-06-01 11:09:45 -07:00
Andre Rodrigues
e353220ecf Fixing broken UT. 
--HG--
branch : 1.x
 2011-06-01 01:12:01 -07:00
Renaud Paquay
7122000ae0 Refactor cache context to support correct parallel execution 
We need a new service, IParallelCacheContext, which allows
tracking the current cache context across threads and tasks
running in the thread pool.

--HG--
branch : 1.x
 2011-05-30 22:31:27 -07:00
Renaud Paquay
d6e4297c91 Merge 
--HG--
branch : 1.x
 2011-05-30 00:01:01 -07:00
Louis DeJardin
252cc00196 Refactoring OwnerEditor and DateEditor breakout 
Splitting OwnerEditor and DateEditor settings apart. Breaking off any knowledge
in the CommonPart of the OwnerEditor and DateEditor.

Changed the settings to appear as TypePart definition instead of Type.

Based the ViewModel on Shape instead of EditorTemplates.

The goal of these changes is to illustrate how a 3rd party module would
accomplish the same kind of ContentPart extension w/out changing core code.

--HG--
branch : 1.x
rename : src/Orchard.Web/Core/Common/Drivers/DateEditorPartDriver.cs => src/Orchard.Web/Core/Common/DateEditor/DateEditorDriver.cs
rename : src/Orchard.Web/Core/Common/Handlers/DateEditorPartHandler.cs => src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs
rename : src/Orchard.Web/Core/Common/Settings/CommonEditorsSettings.cs => src/Orchard.Web/Core/Common/DateEditor/DateEditorSettings.cs
rename : src/Orchard.Web/Core/Common/Drivers/OwnerEditorPartDriver.cs => src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs
rename : src/Orchard.Web/Core/Common/Settings/CommonEditorsSettings.cs => src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorSettings.cs
rename : src/Orchard.Web/Core/Common/ViewModels/OwnerEditorViewModel.cs => src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorViewModel.cs
rename : src/Orchard.Web/Core/Common/Views/DefinitionTemplates/CommonEditorsSettings.cshtml => src/Orchard.Web/Core/Common/Views/DefinitionTemplates/DateEditorSettings.cshtml
rename : src/Orchard.Web/Core/Common/Views/DefinitionTemplates/CommonEditorsSettings.cshtml => src/Orchard.Web/Core/Common/Views/DefinitionTemplates/OwnerEditorSettings.cshtml
rename : src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.CreatedUtc.cshtml => src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
extra : transplant_source : %D1%21c%ACa%F0%0FO%A1%9A%88YS%1Bk9.%CB%04%08
 2011-05-27 19:02:45 -07:00
Renaud Paquay
846a40a1fe Update version to generic 1.2.0 
--HG--
branch : 1.x
 2011-05-24 19:49:58 -07:00
Nathan Heskew
48975f4ca4 Forbidding the use of backslashes in slugs. 
work item: 16593

--HG--
branch : 1.x
 2011-04-05 13:32:43 -07:00
Nathan Heskew
38f1039b7d Changing the usage of "slug" in error messages to "permalink" to match the field's label. 
work item: 17417

--HG--
branch : 1.x
 2011-04-04 10:50:04 -07:00
andrerod
5d55e95506 #17111: Correcting fix. Fixing specflows. 
--HG--
branch : dev
 2011-02-09 00:07:12 -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
4dd978f304 Update the way we copy c++ run time for SqlCe 
--HG--
branch : 1.x
 2011-01-12 00:47:26 -08:00
Renaud Paquay
94563832d9 Updating version # to 1.0 
--HG--
branch : 1.x
 2011-01-11 16:47:30 -08:00
Renaud Paquay
aa8d357998 Fix issue with published and modified dates not properly set 
--HG--
branch : 1.x
 2011-01-06 18:43:26 -08:00