lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,085 Commits 83 Branches 32 Tags
a33471183fa13a3120627430a682e10ae8b89944
Commit Graph

10085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ryan Kelso
7e6b70e7b8 Fixes Issue #5885 
This should fix issue #5885, the DisplayAlias not having length validated. I arbitrarily set it to 1850 for the simple fact that, while the database can hold a 2048 character DisplayAlias, a URL should not be longer than ~2000 characters (per http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers ). If the DisplayAlias is 2048, it's already over the limit and that's not the entire URL for the page, this gives some buffer room for domains.
 2015-10-09 14:23:30 -04:00
Erik Scofield
7fb63fd9eb Fix incorrect project reference probably from a merge from the Naxos branch to this feature. 2015-10-09 11:08:15 -05:00
Matthew Harris
19152dd6fc make orchard help command more intuitive 2015-10-09 10:58:09 +01:00
Matthew Harris
e853550bda fix multitenancy ui glitch 2015-10-09 10:45:17 +01:00
Matthew Harris
24c68bebe4 fix triple columns not fitting on small screens 2015-10-08 21:33:18 +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
1e87eee2e4 Merge pull request #5852 from Codinlab/issue/5737 
[Fixes #5737] ChangeListView throws NRE on unpublished Lists
 2015-10-08 12:27:02 -07:00
Sébastien Ros
53244d702c Merge pull request #5851 from mjy78/issue/5125 
[Fixes #5125] Ensure the modified taxonomy items are not lost if a model validation…
 2015-10-08 12:26:25 -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
07cc3a6bad Merge pull request #5804 from mvarblow/patch-2 
Prevent no-op tasks for taxonomy field updates.
 2015-10-08 12:19:11 -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
6f4762a30c Merge pull request #5785 from mjy78/issue/21244 
[Fixes #5073] Display warning when insecure custom forms are created
 2015-10-08 12:12:53 -07:00
Sébastien Ros
ce3179307d Merge pull request #5784 from mjy78/issue/20514 
[Fixes #4343] Remove id from custom form returnUrl hidden field
 2015-10-08 12:11:06 -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
Erik Scofield
2620dc820d ~Fix resource include 
~Rename javascript resource from RecentContentTab to SelectableContentTab for use in Search content picker as well.
+Add Selectable to Search Content Picker
+Add Select All to Search Content Picker
 2015-10-06 23:27:30 -05: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
Sebastien Ros
9c88c7fcd1 Fixing draft indexation 2015-10-02 15:44:35 +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
Jeff
c81fc70251 Added admin check and moved tag class to separate file with serialization attributes for lowercasing property names. 2015-09-28 16:19:11 +01:00
Jeff
8adb69de54 Loading terms via a service for autocomplete enabled taxonomy field. It also maintains the order the terms are selected. 
Issue #4409.
 2015-09-28 16:19:10 +01:00
Sipke Schoorstra
e2e539897e Updated Azure Host.config. 2015-09-28 15:23:49 +01:00
Gert Smith
a3ded18eb6 Update ElementSessionState.cs 
Make Model Serializable for use in Web Farms with session state stored in a database. Currently a Serialization error is thrown when creating layout or page in the dashboard.
 2015-09-26 10:52:39 +02:00