lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,582 Commits 83 Branches 32 Tags
bb143d7236e81e59f520cdd3e576dc4595396c6d
Commit Graph

9582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahsaro
bb143d7236 Fixed format settings. Made IsManaged optional with default value false in IAliasService. 2015-08-03 12:28:16 +01:00
mahsaro
057a2a32ad Cleanup 2015-07-31 17:42:44 +01:00
mahsaro
8d1d48f2ee Merge pull request #1 from OrchardCMS/dev 
Update with latest from Orchard
 2015-07-31 16:28:34 +01:00
Sebastien Ros
5fd02aacd9 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
 2015-07-30 15:51:28 -07:00
Sebastien Ros
cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07:00
Sipke Schoorstra
64077ae09a Changed labels of content recipe builder step. 
This should make for a more consistent terminology.
 2015-07-30 23:13:19 +01:00
Sipke Schoorstra
2a2aba9548 Fixed that xmldecl was not part of the export.xml. 2015-07-30 22:57:26 +01:00
Sébastien Ros
f3f0352063 Merge pull request #5573 from emeraldarcher/issue/5572 
Fixes #5572 - Bug fixes for Google ReCaptcha 2.0 update
 2015-07-30 12:41:06 -07:00
Daniel Stolt
eec888ff71 Made order of field and part elements in export XML predictable. 2015-07-30 20:32:37 +01:00
Sipke Schoorstra
c746fe926b Fixed removal of database tables when using data table prefix. 2015-07-30 16:39:17 +01:00
Sipke Schoorstra
73170a0d63 Added support for multiple recipe steps of the same type and added unit tests. 
Enables execution of multiple child recipes in a particular sequence. This is useful for the RecipesStep for example, where you want to execute a child recipe first, then execute some commands and import some content, then execute a second child recipe.
 2015-07-30 14:26:01 +01:00
Sipke Schoorstra
a7d2777478 Made DatabaseEnabledTestsBase.Cleanup virtual. 
This enables child classes to provide additional cleanup.
 2015-07-30 14:21:32 +01:00
Daniel Stolt
faa216147d Merge pull request #5575 from Codinlab/issue/5519 
Fixes #5519 : DynamicForms client validation issue
 2015-07-29 16:59:40 +01:00
Sipke Schoorstra
d13d3e7ff3 Fixed a null reference exception by initializing the lists. 2015-07-29 13:06:50 +01:00
mahsaro
8ef3ca1eac Sort,Filter and showing IsManaged Admin UI 2015-07-28 18:37:22 +01:00
Sipke Schoorstra
57692e073d Added RecipesStep. 
This recipe steps enables the execution of other recipes within the same ExecutionId.
 2015-07-28 18:15:43 +01:00
Daniel Stolt
dedded7422 Changed distributed shell restart to only apply to the correct tenant. 2015-07-28 16:35:51 +01:00
Sipke Schoorstra
cbf10216b0 Merge pull request #5581 from dcinzona/patch-4 
Updated README.md Orchard version to 1.9.1
 2015-07-28 15:14:00 +01:00
Gustavo Tandeciarz
bb560f9cdf Updated README.md Orchard version to 1.9.1 
Was listing 1.8.1 as latest version in the readme. Minor update.
 2015-07-28 08:57:49 -04:00
mahsaro
6718f1902b Export and import works 2015-07-28 13:52:55 +01:00
Daniel Stolt
f708362313 Made execution ID an ambient context property in recipe logging. 2015-07-28 13:33:07 +01:00
Daniel Stolt
0dd8686a6f Added "recipes result" command to print result of a recipe execution. 
This helps in automation scenarios where you need to programmatically find out whether setup succeeded or not. Also clarified "setup" command output and added execution ID to the message and cleaned up code in RecipeCommands.
 2015-07-27 21:03:04 +01:00
Thierry Fleury
bc2e0607ef DynamicForms : Mark css & js assets as content 
MsBuild raise errors when ccs or js files have "None" BuildAction
 2015-07-27 13:30:29 +02:00
Thierry Fleury
cd5ca49b32 Fixes #5519 : DynamicForms client validation issue 
jQuery validate script order is important
 2015-07-27 11:31:47 +02:00
Daniel Stolt
f023f66d63 Merged branch '1.9.x' into dev. 2015-07-26 01:28:38 +01:00
Daniel Stolt
6da6c5c214 #5450: Implemented generalized Gulp automation. 
Fixes #5446.
 2015-07-26 01:14:14 +01:00
Lombiq
37a5a7effc Wrapping ITokenizer injection into Work<> for shape methods to prevent possible DependencyResolutionException. 
Not doing this can cause "No scope with a Tag matching 'work' is visible from the scope in which the instance was requested." errors with certain token providers.
 2015-07-26 00:53:19 +02:00
EmeraldArcher
b21f31980b Bug fixes for Google ReCaptcha 2.0 update 2015-07-25 16:07:54 -06:00
Nicholas Mayne
baad84ee7b Merge pull request #5570 from jtkech/patch-3 
Incorrect plus characters break the compilation in DefaultDataMigrationInterpreter.cs
 2015-07-25 21:23:58 +01:00
Lombiq
5420a038ba The AlwaysAccessible attribute now can be added to controllers (not just to actions), fixes #4504 2015-07-25 13:05:41 +02:00
jtkech
93476c321a Update DefaultDataMigrationInterpreter.cs 
Remove incorrect plus characters that break the compilation
 2015-07-24 20:31:25 +02:00
Daniel Stolt
34be0b302f #5564: Fixed potential NRE when tenant RequestUrlHost is empty. 
Fixes #5564.
 2015-07-24 16:40:47 +01:00
Sipke Schoorstra
d6e96252e7 Merge branch 'feature/tabs' into dev 2015-07-24 11:52:39 +01:00
Sipke Schoorstra
f6e5f6b91e Removed "Both" column from Content recipe builder step. 2015-07-24 11:42:26 +01:00
Sipke Schoorstra
a88b35192e Fixed Orchard.AntiSpam compilation issue by correcting data type. 2015-07-24 11:20:22 +01:00
Sipke Schoorstra
bd82412d95 Updated gulped script output. 2015-07-24 10:59:15 +01:00
Sipke Schoorstra
ea91185816 Falling back to a default base URL in case none is configured. 
This fixes an issue where you run Setup from a command line and the recipe does not set BaseUrl on site settings.
The issue is that if the HttpContext does not have a URL, certain properties on the Request object will throw when constructing a URI with a null value.
 2015-07-24 10:34:37 +01:00
Sébastien Ros
c0ebbd4ce7 Merge pull request #5548 from minglei84/1.9.x 
Fixed [Default Value] And [DropForeignKeyCommand] For Mysql
 2015-07-23 12:35:15 -07:00
Sébastien Ros
b3c9a6da65 Merge pull request #5531 from urbanit/patch-2 
ItemEditLink with Html Attributes
 2015-07-23 12:15:43 -07:00
Sébastien Ros
d92fc869bf Merge pull request #5332 from emeraldarcher/issue/5331 
Update Google Recaptcha API

Fixes #5331
 2015-07-23 12:11:06 -07:00
EmeraldArcher
af71576421 Cleanup changes as requested by Jetski5822 and sebastienros 2015-07-23 12:19:52 -06:00
Nicholas Mayne
818b35a370 Merge pull request #5551 from Codinlab/issue/5519 
Fixes #5519 : DynamicForms client validation
 2015-07-23 17:22:12 +01:00
mahsaro
586ad9be84 Alias step builder and executer 2015-07-23 14:19:24 +01:00
Sipke Schoorstra
a39aa6ad3f Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into dev 2015-07-23 11:45:15 +01:00
Sipke Schoorstra
f3a7aeffcb Merge branch '1.9.x' into dev 2015-07-23 11:44:57 +01:00
Sipke Schoorstra
34947136d4 Fixed and updated scripts and gulp in Dynamic Forms and Layouts. 2015-07-23 11:42:16 +01:00
Daniel Stolt
33da5617b7 Added a /Force option to the tenant reset command. 2015-07-23 11:41:55 +01:00
Sipke Schoorstra
9f9a0cc4e5 Updated recipes unit test to accommodate Orchard.Recipes changes. 2015-07-23 10:34:39 +01:00
Sipke Schoorstra
aa143054fc Merge pull request #5562 from OrchardCMS/feature/recipesteps 
Feature/recipesteps
 2015-07-22 23:27:33 +01:00
Sipke Schoorstra
eade51a9db Merge branch 'dev' into feature/recipesteps 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
 2015-07-22 23:26:23 +01:00