Daniel Stolt
86b9f35454
Refactored distributed locks.
2015-09-06 21:40:45 +02:00
Daniel Stolt
1da2d7e3e9
Added process ID to machine name.
2015-09-06 17:34:14 +02:00
Daniel Stolt
27f146d6a4
Fixed compiler warning.
2015-09-06 15:51:55 +02:00
Daniel Stolt
324709400f
Cleaned up naming, formatting and comments in distributed locks.
2015-09-06 15:51:26 +02:00
Daniel Stolt
14482162fd
Marked some tests as long-running. Fixes #5702 .
2015-09-06 00:31:15 +02:00
Nicholas Mayne
1cfd5c497c
Fixing bad delegate
2015-09-05 15:18:44 +01:00
Sébastien Ros
0f757655b8
Merge pull request #5736 from Codinlab/issue/5735
...
Fixes #5735 : ContentType name encoding in Lists
2015-09-04 16:35:03 -07:00
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
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
Sipke Schoorstra
dfce6deaf1
Incremental work on placeable content.
2015-09-04 12:42:08 +01: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
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
2b61e3368d
Fixes #5737 : ChangeListView throws NRE on unpublished Lists
2015-09-03 11:01:18 +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
6995f26fd5
Revert "Relaxed focus targets to allow pasting of elements into templated containers."
...
This reverts commit dd34d87ac9
2015-09-02 13:21:30 +01:00
Sipke Schoorstra
a762cdf63e
Revert "Incremental work on selectable elements."
...
This reverts commit 54c53b7a12
2015-09-02 13:16:41 +01:00
Sipke Schoorstra
3c3ece6404
Revert "Work on selectable container elements."
...
This reverts commit b639d893c0
2015-09-02 13:12:11 +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
