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,890 Commits 94 Branches 33 Tags
4874b2d53d4cc43dc943fa6ac14cc6548662c042
Commit Graph
9890 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros 4491ab8467 Fixing WorkContext resolution 
c.f. https://github.com/OrchardCMS/Orchard/pull/5723#issuecomment-137846843
 2015-09-04 16:31:09 -07:00
Sebastien Ros 3f5c6e49ef Revert "Fixing ShapeDesigner" 
This reverts commit 6eb32a93df.
 2015-09-04 16:20:02 -07:00
Sebastien Ros 39fb266221 Skipping DateTime tests until the right solution is found 
c.f. #5702
 2015-09-04 15:59:24 -07:00
Sebastien Ros a1d06ec89e Adding missing changes to specflow web.config 2015-09-04 15:58:10 -07:00
Sebastien Ros ee149191b9 Formatting web.config 2015-09-04 15:53:39 -07:00
Sebastien Ros 3f8e063d9c Fixing OrchardHost unit tests 2015-09-04 15:53:11 -07:00
Sebastien Ros cb25be4444 More Json.NET binding redirections 2015-09-04 14:47:51 -07:00
Sebastien Ros 9b91b1b260 Removing unnecessary resolution 2015-09-04 13:20:08 -07:00
Sebastien Ros 428b44a900 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 13:15:43 -07:00
Sebastien Ros c2194381f8 Removing unused usings 2015-09-04 12:12:13 -07:00
Sebastien Ros c860b89e23 Removed erroneous HttpContextBase registrations 2015-09-04 12:12:02 -07:00
Sebastien Ros 04f29ba70c Revert "Cherry picked ce630f980c7a79ae17b36598f3834c4ffd523739." 
This reverts commit aba53e122d.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 10:59:31 -07:00
Sébastien Ros e118695ea7 Merge pull request #5738 from harmony7/4852-orchardshellevents-workcontext 
#4852: Wrap IOrchardShellEvents in a work context
 2015-09-04 10:09:36 -07:00
Sipke Schoorstra 94db186b37 Minor polishing. 2015-09-04 14:43:30 +01:00
Thierry Fleury 894e90f485 Use new ActionLink extension method. 2015-09-04 15:08:30 +02:00
Sipke Schoorstra 3efc38dc65 Refactored distributed locks to support existing installations. 2015-09-04 14:06:08 +01:00
Thierry Fleury 97bb52bbdd Add LinkExtensions 
Allows using IHtmlString as linkText
 2015-09-04 15:05:25 +02:00
Sebastien Ros 1c3e253edb Remove broken tests 2015-09-03 15:37:27 -07:00
Sébastien Ros 65c3b2ab2e Merge pull request #5734 from OrchardCMS/feature/morelocking 
Refactoring locking strategy
 2015-09-03 15:05:42 -07:00
Sebastien Ros 9ea87837c3 Refactoring locking strategy 
Adding support for tenants
Removed ThreadId field
Removed Count field
Optimized db access by using Monitor for the local machine/tenant checks
Removed Machine/Thread scopes
 2015-09-03 15:03:42 -07:00
Sébastien Ros f3d08d61c4 Merge pull request #5741 from mvarblow/patch-2 
Mark the npm repository as private
 2015-09-03 14:24:05 -07:00
Sébastien Ros 22697edeec Merge pull request #5742 from mvarblow/patch-3 
Suppressed warning CS0436 in Orchard.Framework
 2015-09-03 14:23:26 -07:00
mvarblow e0fc576f9e Suppressed warning CS0436 in Orchard.Framework 
Daniel changed the Orchaard.Framework project to ignore the JetBrains.Annotations conflicts for debug builds several months back. See http://orchard.codeplex.com/workitem/21056 and 78901ba . However, the problem still exists for release builds. This pull request applies the same fix (ignoring the warning) to release builds.
 2015-09-03 16:07:06 -04:00
mvarblow ef9e5de8f4 Mark the npm repository as private 
'npm install' was generating several warnings about missing properties in package.json. Marking the repository as private clears up the warnings.
 2015-09-03 16:03:39 -04:00
harmony7@pex2.jp 5878611817 Wrap IOrchardShellEvents in a work context. 2015-09-03 22:19:21 +09:00
Sipke Schoorstra e02bf2dacb Merge pull request #5680 from OrchardCMS/feature/initializing-tenant 
Implemented Initializing status.
 2015-09-03 13:15:42 +02:00
Thierry Fleury f5772334e1 Fixes #5735 : ContentType name encoding in Lists 2015-09-03 10:05:02 +02:00
Sipke Schoorstra d0ad5de25c Rebuilt assets with Gulp. 2015-09-02 17:29:36 +01:00
Sipke Schoorstra 902021c686 Fixed default dashboard layout data string. 2015-09-02 14:40:15 +01:00
Sipke Schoorstra ce15e438ca Getting rid of a compiler warning regarding deprecated ExportOptions type. 2015-09-02 14:10:41 +01:00
Sipke Schoorstra 748a354632 Merge pull request #5628 from OrchardCMS/feature/distributed-locking 
Feature/distributed locking
 2015-09-02 12:49:38 +02:00
Sipke Schoorstra db03498cfa Deletes lock records when Count reaches 0. 
Also some minor polishing and changed ObjectDisposedException to OrchardException in case a lock was already released.
 2015-09-02 11:43:12 +01:00
Sipke Schoorstra 553a0e260a Merge branch 'dev' into feature/distributed-locking 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-02 10:20:57 +01:00
Sipke Schoorstra e9799d5537 Fixed a potential "ValueFactory attempted to access the Value property of this instance" issue. 
The underlying cause of such an error is a recursive call issue, where some code in a background task accesses the current http context (which is a stand in), while its construction also (indirectly) accesses the http context in order to get the site content item and query the configured BaseUrl. In theory we could access this information straight from the database without loading the Site content item, but since the URL value doesn't really matter it is better to keep it simple.
 2015-09-01 15:05:28 +01:00
Lombiq fcc4a944bb Fixing that Projection Elements with the Default Layout selected weren't exported 2015-08-30 22:29:12 +02:00
Sebastien Ros a0d61c67b8 Refactoring Import methods 2015-08-28 17:06:34 -07:00
Sébastien Ros 638c05b5ff Merge pull request #5720 from jtkech/patch-4 
#5715: Feature key checking in CompositionStrategy
 2015-08-28 15:42:45 -07:00
jtkech 46de0273d5 Update CompositionStrategy.cs 2015-08-29 00:27:09 +02:00
Lombiq 42ff708da8 #5664: Lucene should page operations with the highest possible page size 2015-08-28 23:38:30 +02:00
Sipke Schoorstra 735ab882b2 Removed unnecessary feature from setup context. 2015-08-28 12:25:35 +01:00
Sebastien Ros b52a846c5f #5664: Lucene should page operations 
Fixes #5664
 2015-08-27 15:31:39 -07:00
Sébastien Ros 9a8b64393e Merge pull request #5671 from RoyalVeterinaryCollege/4352 
#4352: orphaned awaitingactivities

Fixes #4352
 2015-08-27 12:39:24 -07:00
Sébastien Ros 035ad949a8 Merge pull request #5687 from planetClaire/5686 
Fix user defined outcome connections in Branching activities
 2015-08-27 12:08:02 -07:00
Sebastien Ros 6eb32a93df Fixing ShapeDesigner 
Fixes #5647
 2015-08-27 11:30:52 -07:00
Sebastien Ros becc4abf23 Fixing Visual Studio warnings on web.config files 2015-08-27 11:11:10 -07:00
Sebastien Ros 2750b04173 Fixing feature name case 2015-08-27 11:10:35 -07:00
Sebastien Ros 935d07bb1b Fixing duplicate overload 2015-08-27 11:09:56 -07:00
Sebastien Ros 3729bac266 Removing unnecessary usings 2015-08-27 11:09:40 -07:00
Sebastien Ros 4a2d3aeb7c Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
	src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
 2015-08-27 10:45:16 -07:00
Sebastien Ros 6abb7d5459 Revert "Fixed broken setup due to auto-enabling features." 
This reverts commit 8f2bd16fed.
 2015-08-27 10:42:51 -07:00