lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,028 Commits 83 Branches 32 Tags
687026d727bfcb36501d8fc7be759304ce9d33ae
Commit Graph

10028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros
687026d727 Merge pull request #5898 from kumards/dev 
Fixing threading issue in OrchardLog4netLogger
 2015-10-15 12:17:44 -07:00
Sébastien Ros
c66dafc460 Merge pull request #5922 from rtpHarry/orchardexe-help-filter 
Make orchard help command more intuitive

Closes #422
 2015-10-14 09:16:28 -07:00
Sipke Schoorstra
d6c4d648a6 Refactored content handler invocations using Invoke. 2015-10-13 21:29:19 +02:00
Sipke Schoorstra
161ac92c9e Removed unused Guid property from LayoutRecord. 2015-10-13 20:41:05 +02:00
Sipke Schoorstra
5344ed2e2a Fixed order of exported content part elements. 
This fixes an issue where the LayoutPart XML element would appear last in the content item XML element due to the fact that the <LayoutPart> element was being added only in the Exported event and not in the Exporting event.

To fix this, the <LayoutPart> element is no first added during the Exporting event, and later updated in the Exporting event.
 2015-10-13 20:17:03 +02:00
Daniel Stolt
40156e5be1 Merge pull request #5872 from OrchardCMS/issue/5848/importexport 
Refactored Import process.
 2015-10-12 21:39:21 +02:00
Sipke Schoorstra
51fe8fecb9 Added ImportCompleted event to field drivers too. 2015-10-12 21:37:04 +02:00
Sipke Schoorstra
ed78338e4e Merge branch 'dev' into issue/5848/importexport 2015-10-12 21:27:37 +02:00
Sipke Schoorstra
98c8101891 Added batch label to log messages. 2015-10-12 21:24:37 +02:00
Sipke Schoorstra
80a51561b5 Added CompleteImport to IContentManager. 
This makes it easier for other places that leverage the Import method to also invoke the CompleteImport method.
 2015-10-12 21:22:44 +02:00
Sipke Schoorstra
9605d216e6 Renamed a method and improved logging messages. 
- Renamed ImportedAll to ImportCompleted.
- Added a "batch label" to the BatchedInvoke method to be able to better identify what's being executed from the log files.
 2015-10-12 12:54:59 +02:00
Nicholas Mayne
314c7ea5b5 Merge pull request #5930 from CSurieux/dev 
upgrade the WebApi dlls in lib to version 2.2.29 fixes #5873
 2015-10-11 21:54:00 +01:00
CSurieux
330f637473 upgrade the WebApi dlls in lib to Microsoft HTTP Client Libraries 2.2.29 (package) 2015-10-11 14:31:28 +02:00
Sipke Schoorstra
f8ae4cf626 Merge branch 'dev' into issue/5848/importexport 2015-10-10 12:49:56 +02:00
Sipke Schoorstra
df2ab76613 Added ImportCompleted event. 
This event is invoked after all content items have been imported.
 2015-10-09 23:52:35 +02:00
Daniel Stolt
f8409d5ce5 Updated the Gulp pipeline. 
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
 2015-10-09 22:41:21 +02:00
Sipke Schoorstra
ee43743621 Reverted changes to content manager and content step. 2015-10-09 22:35:50 +02:00
Matthew Harris
19152dd6fc make orchard help command more intuitive 2015-10-09 10:58:09 +01:00
Sébastien Ros
8a332926cb Merge pull request #5888 from jtkech/patch-3 
[Fixes #5883] Logging thread infos overlapping
 2015-10-08 12:34:15 -07:00
Sébastien Ros
9e2b6f8b8a Merge pull request #5875 from 560889223/fix/HttpRequestPlaceholder 
HttpRequestPlaceholder should implement property AnonymousID
 2015-10-08 12:29:51 -07:00
Sébastien Ros
e3ca35548c Merge pull request #5850 from armanforghani/issue/4951 
[Fixes 4951] Adding ManageTemplates permission.
 2015-10-08 12:25:45 -07:00
Sébastien Ros
5fc3170f1c Merge pull request #5796 from OrchardCMS/issue/5791/homealias 
[Fixes #5791] Home Alias fixes for issue
 2015-10-08 12:15:54 -07:00
Sébastien Ros
f4136b9ed8 Merge pull request #5691 from RoyalVeterinaryCollege/3402 
#3402: Implemented List tokens.
 2015-10-08 12:06:21 -07:00
Another Developer
e5e02bfd2a Update OrchardLog4netLogger.cs 
Fix for "ValueFactory attempted to access the Value property of this instance"
 2015-10-05 11:19:20 -04:00
Piotr Szmyd
b04a22fa4b Merge pull request #5887 from jtkech/patch-2 
Fixes #5879: Layout part OnIndexing fails when called in a background task
 2015-10-05 15:36:42 +02:00
Nicholas Mayne
e6c7851cca Merge pull request #5897 from paynecrl97/patch-1 
Fixes 1+n db call issue
 2015-10-05 12:35:43 +02:00
Daniel Stolt
9219609ce6 Updated jQuery type definitions in Orchard.Azure.MediaServices. 2015-10-04 19:34:47 +02:00
Daniel Stolt
f95c5b5430 Cleaned up after merge of Azure upgrade from 1.9.x. 2015-10-04 18:05:46 +02:00
Daniel Stolt
df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Zoltán Lehóczky
5bd2066bf3 Fixing widget RenderTitle import 2015-10-04 01:41:12 +02:00
Daniel Stolt
42914c7896 Fixed a column resizing issue. 2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895 Enabled focusing (and thereby pasting into) non-sealed templated containers. 2015-10-03 19:26:13 +02:00
jtkech
44a342c4fe Update DefaultCacheStorageProvider.cs 2015-10-02 02:15:08 +02:00
jtkech
850a39bd8b Update OrchardLog4netLogger.cs 2015-10-01 21:22:21 +02:00
jtkech
f3902feb35 Update WorkContextAccessor.cs 2015-10-01 21:09:44 +02:00
Sebastien Ros
508d97ed7d Fixing merge 2015-10-01 09:14:21 -07:00
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
 2015-09-30 15:57:34 -07:00
Sebastien Ros
62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Daniel Stolt
b5d4cf01b5 Moved CopySqlCeBinaries earlier in the build process of Orchard.Web.csproj. 
This fixes an issue where, if Orchard.Web has not previously been built, the SQL CE binaries will not be included when doing a Web Deploy publish of Orchard.Web.
 2015-09-30 20:59:32 +02:00
Daniel Stolt
7d4ed4416d Updated to latest version of MSBuild community tasks. 
This makes it possible to execute Orchard.proj to build and package on a build server that doesn't have .NET Framework 3.5 installed.
 2015-09-30 19:29:12 +02:00
Daniel Stolt
e0fe699049 Corrected build action of Placement.info in Orchard.Dashboards. 2015-09-30 19:12:01 +02:00
Jeff
fc759a107e Added ElementAt operator to List token. 2015-09-30 12:03:43 +01:00
Qingyu Zhou
e75b3aa06c CookieCultureSelector.EvaluateResult is caught with NotImplementedException 
The issue is caused by CookieCultureSelector is expecting a working implementation of HttpRequestBase.AnonymousID, yet in one case that wont'be true. During background task execution, which is started by SweepGenerator on a background thread without real HTTP request, the HttpRequestBase object is created using HttpRequestPlaceholder, which is trying to simulate a valid HTTP Request to some extent, particularly leaving its property AnonymousID not implemented. However, CookieCultureSelector.EvaluateResult is expecting context.Request.AnonymousID being implemented in some way.

This could be seen as a bug in Orchard.CultureSelector, as one can justify that it should be aware of fake HttpRequestBase object. On the other hand, this could be an Orchard bug as well, if the philosophy is to keep the users of HttpRequestBase objects ignorant of the actual implementation. I prefer the latter, thus this fix.
 2015-09-29 15:34:40 -07:00
Sipke Schoorstra
5f40af0f99 Changed LayoutRecord Guid type to Guid. 2015-09-29 21:13:11 +01:00
Sipke Schoorstra
5d5f55f535 Refactored Import process. 
* Added Imported event to Elements.
* Invoking Imported event at the end after all content items have been imported.

Fixes #5848.
 2015-09-29 14:20:12 +01:00
Jeff
1706ee29ba Merged sum operator. 2015-09-29 11:05:38 +01:00
Jeff
423fec90b3 Issue #3402: Implemented List tokens. 2015-09-29 11:05:38 +01:00
Chris Payne
90feec6369 Fixes 1+n db call issue 
Adds
 2015-09-29 01:24:39 +01:00
Sébastien Ros
8ed39703e5 Merge pull request #5864 from Garpo001/patch-1 
Serialization error is thrown when creating layout or page in the dashboard when using Layouts in a Web Farm.
 2015-09-28 09:38:04 -07:00
Sébastien Ros
9bafa7ff9a Merge pull request #5674 from RoyalVeterinaryCollege/4409 
#4409: Use service for autocomplete enabled taxonomy field and maintain ordering
 2015-09-28 09:37:29 -07:00