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
7,890 Commits 83 Branches 32 Tags
f856da3b02f7c975703b512cbef4dd51e0da54e4
Commit Graph

7890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
f856da3b02 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs
 2014-06-13 15:50:33 -07:00
Sipke Schoorstra
cce3a0e1ed Making the WorkContext on WebViewPage available for shapes being rendered in background tasks as well. 2014-06-13 15:45:22 -07:00
Sebastien Ros
d0f5454fc1 Fixing ShellDescriptor optimization 2014-06-13 15:36:27 -07:00
j3ffb
3a0fda4f92 #20641: Fixing List pager 
Work Item: 20641
 2014-06-13 12:43:37 -07:00
j3ffb
be3abdb015 #20444: Unable to use HasTerms more than once 
Work Item: 20444
 2014-06-13 12:38:42 -07:00
Bertrand Le Roy
a46f650f60 Optimizing TermsPartHandler 2014-06-13 12:20:04 -07:00
Bertrand Le Roy
ae57320926 Adding a database index on MediaPartRecord.FolderPath 2014-06-13 12:19:45 -07:00
Sebastien Ros
c7aacf6f9f #20681, #20598: Fixing Media Profiles path encoding 
Work Items: 20681, 20598
 2014-06-13 11:37:32 -07:00
Sebastien Ros
63786525c7 #20639: Fixing C# script behavior with tokens 
Work Item: 20639
 2014-06-13 11:14:35 -07:00
Sebastien Ros
6eac97675e #20694: Fixing TagCloud with no content items 
Work Items: 20694
 2014-06-13 11:09:18 -07:00
Sebastien Ros
e31aebff5a Optimizing some queries 2014-06-12 16:37:08 -07:00
Sebastien Ros
53b441961f Merge branch '1.8.x' into 1.x 2014-06-12 10:22:55 -07:00
Sebastien Ros
e871a48514 Patching DataCacheFactory disposal 
Known bug in the API: http://blogs.msdn.com/b/cie/archive/2014/04/29/cache-retry-fails-what-next.aspx
 2014-06-12 10:22:21 -07:00
Sipke Schoorstra
3561d57324 Moving IFeatureEventHandler to its own file. 2014-06-11 20:52:55 -07:00
Sebastien Ros
2574b87bdf Implementing a tokens html filter 2014-06-11 15:04:28 -07:00
Sipke Schoorstra
a342329cc6 Fixing a fix. 2014-06-09 23:54:45 -07:00
Lombiq
941eb3bfe3 Removing references to non-existing scripts from Orchard.Templates 2014-06-10 01:14:34 +02:00
Sipke Schoorstra
d012943b51 Updating description. 2014-06-08 12:26:46 -07:00
Sipke Schoorstra
ba622e81e8 Fixing DecisionActivity and adding WorkflowContext to scope. 2014-06-07 22:42:40 -07:00
Sipke Schoorstra
9e9859ed1f Adding AssignRole activity view. 2014-06-05 14:04:49 +02:00
Sipke Schoorstra
eaab7139ed Fixing IsInRoleActivity flow output. 2014-06-04 14:20:26 +02:00
Sipke Schoorstra
b621dcdebf Fixing signal token url generation. 
Orchard.Framework.Mvc.StandardExtensionRouteProvider generates routes to match the module's Name (as defined in the module manifest).
So to generate a URL to the "Orchard.Workflows/Signal/Trigger" action, the URL must be "~/Workflows/Signal/Trigger", since the Name of the module is "Workflows".
 2014-06-04 13:16:00 +02:00
Lombiq
ef491b730a #20701: Fixing e-mail settings screen 
Work Item: 20701
 2014-06-02 12:39:35 +02:00
Daniel Stolt
8ca3b8c5c5 Fixing layout of preview in media library picker field. 2014-06-01 00:44:50 +02:00
Lombiq
868a726567 Fixing tenant editor "Select all" checkbox 2014-05-31 19:39:35 +02:00
Sebastien Ros
ac79d66e69 Merge branch '1.8.x' into 1.x 2014-05-29 15:56:30 -07:00
Sebastien Ros
ab431c6e89 Removing dependency on Part for rendering videos 2014-05-29 15:55:59 -07:00
Sebastien Ros
a35b0effee Fixing video rendering with no encoders 2014-05-29 15:55:11 -07:00
Sebastien Ros
454495445d Merge branch '1.8.x' into 1.x 2014-05-28 10:19:06 -07:00
Sebastien Ros
c4b4f1593f Fixing output cache encoding 2014-05-28 10:13:30 -07:00
Sebastien Ros
12fed85d84 Fixing lost position when editing ContainablePart 2014-05-27 09:27:55 -07:00
Sebastien Ros
d5221d0444 Merge branch '1.8.x' into 1.x 2014-05-26 17:37:43 -07:00
Sebastien Ros
daa95def73 Disabling user mode output cache 2014-05-26 17:37:09 -07:00
Sebastien Ros
295099c215 Merge branch '1.8.x' into 1.x 2014-05-26 12:08:12 -07:00
Sebastien Ros
d63be30390 Improving output cache 
The OutputCache HttpModule is necessary to enable kernel cache. However
the current usage won't impact memory usage as pages are not
stored in output cache unless Page.InitOutputCache is called in MVC.
c.f. https://aspnetwebstack.codeplex.com/SourceControl/latest#src/System.Web.Mvc/OutputCacheAttribute.cs
 2014-05-26 12:07:38 -07:00
Daniel Stolt
5097416a4f Merge branch '1.8.x' of https://git01.codeplex.com/orchard 2014-05-23 00:30:40 +02:00
Daniel Stolt
fe03101d84 Removed version numbers from references to assemblies in the lib folder in Orchard.Azure.MediaServices.csproj. 2014-05-23 00:30:23 +02:00
Lombiq
a1039f5609 Orchard.Framework/Caching: Fixing typo in a comment in Cache.cs 2014-05-21 18:48:20 +02:00
Sipke Schoorstra
6e49ad2ce2 Changed the Template title syntax requirements. 
This change makes it possible to use "complex" shape names (e.g. "Email__Wrapper"). Before this change, the shape file name syntax was required (e.g. "Email-Wrapper").
However, such shapes would not be found when using the {Shape.Execute} token when using the other syntax (e.g. "Email__Wrapper"), since TemplateShapeDisplayEvent simply register the shapes by specified title without first translating the file based syntax to code based syntax.
 2014-05-20 20:04:19 +02:00
Lombiq
45392f60de #20658: Factored out Razor-related services in Templates to separate feature. 
Work Item: 20658
 2014-05-20 16:03:55 +02:00
Lombiq
bca9ca1304 Orchard-style code formatting in Orchard.Templates 2014-05-20 14:54:58 +02:00
Sebastien Ros
2e5b601474 Fixing multi-tenant specflow tests 2014-05-19 16:14:15 -07:00
Sebastien Ros
84feb2814e Fixing Lists specflow tests 2014-05-19 16:00:04 -07:00
Sebastien Ros
34410dd429 Fixing Widgets specflow tests 2014-05-19 15:30:08 -07:00
Sebastien Ros
6aea57b2ca Fixing DateTimeField specflow tests 2014-05-19 14:38:49 -07:00
Sebastien Ros
6e90698c8c Fixing comments specflow tests 2014-05-19 14:27:30 -07:00
CSurieux
8547013d1d #20113: Added ContentTypeDefinition to ContentTypePartDefinition. 
When we can now access the ContentType and all the parts is contains when editing its Setting.

Work Item: 20113
 2014-05-19 22:11:25 +01:00
Sipke Schoorstra
34122e6834 Updating Redirect activity view. 
This change will show the provided redirect URL using a tooltip rather than on the activity node itself.
 2014-05-19 21:59:59 +02:00
Sipke Schoorstra
67634bab0f Adding "Done" outcome to Redirect activity. 2014-05-19 21:58:39 +02:00
Benedek Farkas
886827fa7a Merge branch '1.8.x' into 1.x 2014-05-19 17:31:29 +02:00