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 1 Packages Projects Releases Wiki Activity
10,779 Commits 94 Branches 33 Tags
580b79c24db2da9b7d97039b4fd6db03412fb5c6
Commit Graph

195 Commits

Author SHA1 Message Date
jtkech
ff9d7aca51 Update Edit.cshtml 2015-05-25 21:42:00 +02:00
jtkech
1c81a77302 Update AdminController.cs 2015-05-25 21:37:37 +02:00
Lombiq
2a57a15363 Fixing that in Workflows localized outcomes were used as identifiers, breaking when a localization package was installed. 
This is a breaking change for localized sites, see 1.10 release notes.
 2015-05-20 01:31:15 +02:00
Sebastien Ros
f2b8d68345 Merge branch '1.9.x' into dev 2015-05-14 10:26:10 -07:00
Lombiq
3760e12029 Adding the ability to rename workflows, fixes #3570 2015-05-14 18:04:45 +02:00
jtkech
ae18e0b817 #5235: Awaiting activities not cleared on saving 2015-05-07 21:37:04 +02:00
jtkech
61b8f82fd7 #5234 Duplicate lines in WorkflowManager 2015-05-07 21:24:08 +02:00
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Skrypt
af6282c275 Fixed #5118, #3998 : Adding Workflow Definition name string empty validation. 
Fixed #4716, #4367 : Adding Workflow Definition bulk delete.
 2015-04-28 23:56:21 -04:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Piotr Szmyd
a97a7e26d5 #21294: Added optional date parameter to TimerActivity. Also added description hints and updated class name. 
Work Item: 21294
 2015-03-24 15:17:30 +01:00
Sebastien Ros
5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Eric Perez
501650cae1 #20651: Fixing duplicate workflow 
Work Item: 20651
 2015-02-01 14:37:49 +01:00
Sipke Schoorstra
3fb84f80ef #21075: Fixing outcome labels. 
Work Item: 21075
 2014-11-16 02:24:38 -08:00
Codinlab
12d3eb66dc #20834 : Fix Workflows transition endpoints localization issue. 
Work Item: 20834
 2014-10-14 16:40:12 +01:00
Stanley Goldman
8ae9be76b9 Adding a Search Filter to Orchard Workflows Toolbox 2014-10-12 15:24:46 -04:00
Nicholas Mayne
c7c9f8e233 Merge branch '1.x' into feature/localizationchanges 2014-08-27 21:43:11 +01:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Nicholas Mayne
7eb1720a9d RTL on Workflows and Media Lib 2014-08-15 23:45:42 +01:00
Sebastien Ros
c816d8e24f Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
 2014-08-15 13:52:08 -07:00
Sebastien Ros
9550146acc Fixing build warnings 2014-08-15 13:42:52 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Piotr Szmyd
7cb97fdd7c Revert "Fixing build warnings. Added binding redirects for JSON.NET 6.0" 
It's a tooling issue, not Orchard - warnings are caused by Azure VS Tools 2.3 (http://connect.microsoft.com/VisualStudio/feedback/details/850425/windows-azure-vs-tools-breaking-msbuild-for-web-projects)
 2014-07-15 21:57:59 +02:00
Piotr Szmyd
eb38abcc31 Fixing build warnings. Added binding redirects for JSON.NET 6.0 2014-07-15 14:23:43 +02:00
Lombiq
2843333fc1 Fixing that Orchard.Workflows.Timer didn't have a name in the module manifest 2014-07-12 01:05:47 +02:00
Sebastien Ros
53b441961f Merge branch '1.8.x' into 1.x 2014-06-12 10:22:55 -07: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
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
Sebastien Ros
d277c42093 Merge branch '1.8.x' into 1.x 2014-05-16 16:56:02 -07:00
Sebastien Ros
dcbd6e3d17 Fixing some duplicated references 
This prevents the host from restarting as it would otherwise
think the reference is updated when loading the module.
In the specflow tests it also implied a domain restart and broke them.
 2014-05-16 16:52:58 -07:00
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07:00
Sebastien Ros
a6b78b43d8 Merge branch '1.8.x' into 1.x 2014-05-02 10:41:32 -07:00
Sebastien Ros
9525bf9e09 #20574: Optimizing transaction log 
Work Item: 20574
 2014-05-02 10:06:50 -07:00
Bertrand Le Roy
b99e4201c8 Workflows Timer missing a category, Workflows moved to Workflows category 2014-04-28 10:24:24 -07:00
Sebastien Ros
dfb87793e1 Moving timers to its own feature 2014-04-17 15:37:24 -07:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
Sebastien Ros
d6a8cb8b8d Merge branch '1.7.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
 2014-03-25 14:38:13 -07:00
Sebastien Ros
0ce6023378 Fixing assembly reference in Workflows 2014-03-17 15:49:27 -07:00
Sebastien Ros
7cc07a0a53 Fixing assembly reference in Workflows 2014-03-17 15:22:10 -07:00
Sebastien Ros
db50a5aecb Merge branch '1.7.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
 2014-03-17 12:09:21 -07:00
Lombiq
d0c89f3ee8 Making some more script includes consistent by explicitly adding AtFoot() where it was implied, in Workflows 2014-03-02 20:20:50 +01:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Sebastien Ros
70be174c72 Implementing Orchard.JobsQueue 2014-01-14 14:43:20 -08:00
Sipke Schoorstra
013d55357b Added Workflow State token provider. 
This token provider enables tokenized fields to access WorkflowContext state values.
Example: {Workflow.State:MyData.MyProperty.SubProperty}
 2014-01-12 17:42:28 +01:00