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 2 Packages Projects Releases Wiki Activity
9,038 Commits 94 Branches 33 Tags
7cdb9ecf53560bbb1f3d52e75f2c278b274a6067
Commit Graph
367 Commits
Author SHA1 Message Date
Sebastien Ros 51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
Sebastien Ros 1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sebastien Ros 9d5bc20666 Fixing unit tests 2015-06-18 14:19:44 -07:00
Sebastien Ros 72534d632d Adding more detailed message on failing tests 2015-04-29 15:15:43 -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
Sipke Schoorstra dad113feed #5116: Fixed failing tests. 2015-04-15 14:00:16 +02:00
Sebastien Ros 5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Codinlab 46fd3d22f0 #18787 : slugify function 
Work Item: 18787
 2015-02-08 13:00:31 +00:00
Lombiq 9320e48b09 #20942: Setup now harvests setup recipes from all modules for the setup screen. 
Work Item: 20942
 2015-01-18 00:26:25 +01:00
Lombiq 5b74c20553 #21036: User password hashes are now created with the PBKDF2 algorithm. 
Work Item: 21036
 2015-01-17 22:42:40 +01:00
Stanley Goldman 6796c71d5e #21034: Preventing recursive dump of ObjectDumper 
WorkItem: 21034
 2014-10-25 18:33:52 -04:00
Stanley Goldman bc6daff857 Fixing ObjectDumper unit tests 2014-10-25 18:12:19 -04:00
Stanley Goldman a1eb07063a ObjectDumper Unit Tests 2014-10-25 17:54:23 -04:00
Nicholas Mayne 016ee8cb02 Fixing reference to Castle in Orchard Tests 2014-10-13 13:52:38 +01:00
Stanley Goldman e90001605d #20453: Adding Clone Button to Media Library 
#20453: Fixing Formatting Issues

#20453: Adding Clone Button to Media Library

Work Item: 20453

Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
 2014-10-12 16:17:01 -04: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 293c58ef46 Adding binding redirect in unit tests for NHibernate 2014-08-22 17:06:28 -07:00
Sebastien Ros 288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros c816d8e24f Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
 2014-08-15 13:52:08 -07:00
Sebastien Ros 43a2e1a282 #20818: Adding analyzed search terms option 
Work Item: 20818
 2014-08-14 18:22:29 -07:00
Sebastien Ros 221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros fdd6c0aba7 Adding Lucene analyzer extensibility point 2014-08-06 16:56:11 -07:00
Sebastien Ros f24cedd425 Fixing unit RoleService unit tests 2014-07-30 11:16:29 -07:00
Sebastien Ros 1916a3c351 Fixing unit tests 2014-04-18 17:05:18 -07:00
Sebastien Ros 37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
Sebastien Ros 0fbc2e47bc Fixing unit tests and warnings 2014-03-26 17:37:01 -07:00
Sebastien Ros 35d2a6c8fd #20577: Fixing Orchard.Templates 
Work Item: 20577
 2014-03-26 12:21:51 -07:00
Sebastien Ros db50a5aecb Merge branch '1.7.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
 2014-03-17 12:09:21 -07:00
Sebastien Ros 80a03e040f Fixing Warmup unit tests 
The microsoft.com website is no more returning
404 status code on missing pages.
 2014-03-14 10:58:41 -07:00
Daniel Dabrowski 69ce0d1de4 #20549: Fixed. Installed files from package have same last write time. 2014-03-11 15:06:02 -07:00
Daniel Dabrowski b7de2b702e #20549: Test which proves that files have different last write time when installing package. 2014-03-11 15:06:00 -07:00
Piotr Szmyd ce535797aa Updated ancient Castle libraries to version 3.2.0. Castle.DynamicProxy2 and Castle.MicroKernel are obsolete - have already been merged into Castle.Core. 2014-02-21 16:00:43 +01:00
Sebastien Ros 57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Sebastien Ros 70be174c72 Implementing Orchard.JobsQueue 2014-01-14 14:43:20 -08:00
Erik Oppedijk 5805f0ad9b Repair intellisense, update references 2013-12-04 11:54:34 -08:00
Sebastien Ros 386c1b7d6d Fixing unit tests 2013-11-12 17:56:02 -08:00
Sebastien Ros de0c4345f0 Shifting WarmupSettingsPart 2013-11-12 17:56:00 -08:00
Sebastien Ros 5c3e07dc99 Shifting TagsPart 2013-11-12 17:51:50 -08: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 46c7ea5a92 Improving search API 
Adding new methods to filter using greater/lower criteria
 2013-10-10 15:01:19 -07:00
Sebastien Ros d920b164e0 Implementing media search 2013-09-25 16:41:44 -07:00