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
9,533 Commits 83 Branches 32 Tags
d92fc869bf92f0b79cae8f03f26e852b31c524a6
Commit Graph

9533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastien Ros
894d932210 Reverting changes on Orchard.proj for Kudu 
Fixes #5557
 2015-07-22 14:50:14 -07:00
Sebastien Ros
8032d202e3 Compiling the solution for CI tests 2015-07-22 14:36:57 -07:00
Sebastien Ros
046c62e710 Diagnosing CI failures (wip) 2015-07-22 14:19:28 -07:00
Sebastien Ros
9001972d8b Fixing functional tests execution 
On .NET 4.6
 2015-07-22 13:03:58 -07:00
Sipke Schoorstra
1d8897e49e Export parts in alphabetical order. 2015-07-22 15:52:25 +01:00
Sipke Schoorstra
cf94a646c5 Formatted Setup/Index.cshtml file. 2015-07-22 10:17:34 +01:00
Sipke Schoorstra
eace3c2506 Fixed recipe grouping on Setup screen. 2015-07-22 10:15:20 +01:00
Sebastien Ros
0fc8f5accf Updating Redis driver 2015-07-21 18:08:10 -07:00
Sipke Schoorstra
9bd2c8448d Merge branch 'dev' into feature/recipesteps 2015-07-21 23:53:48 +01:00
Lombiq
5f7299cd81 Adding missing OrchardFeature attributes to Dynamic Forms validation services 2015-07-21 23:46:22 +02:00
Lombiq
2a34cb582b Reverting that form validation services of Dynamic Forms were moved to a separate feature (should be only on dev) 2015-07-21 23:42:58 +02:00
Daniel Stolt
7411013b45 Fixed a localization unit test that was failing on some cultures. 2015-07-21 22:11:54 +01:00
Sebastien Ros
e6211dbf54 Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x 2015-07-20 14:31:33 -07:00
Sebastien Ros
1664aa1bde Fixing Setup due to missing dynamic forms feature 2015-07-20 14:30:57 -07:00
Sebastien Ros
1b54e3e8fb Restoring build log level 2015-07-20 14:29:56 -07:00
Sipke Schoorstra
5d09053d30 Fixed an issue when changing the homepage. 
This fixes an issue where the previous published homepage would not have its regenerated alias stored.
 2015-07-20 20:56:37 +01:00
Sipke Schoorstra
1494aec836 Removed mixed tabs and spaces. 2015-07-20 20:10:58 +01:00
Sipke Schoorstra
b0177ab7b8 Added configuration upload to Export screen. 2015-07-20 17:13:28 +01:00
Sipke Schoorstra
4c962b2f66 Added support for default configurations, enabling a full site export. 
The command "export file" with no arguments will export everything.
 2015-07-20 16:05:27 +01:00
Sipke Schoorstra
2c6c4a22c4 Updated command line support for import/export. 
- Added export file switch.
- Added config file switch for both import and export commands.
- Minor refactoring.
 2015-07-20 15:39:06 +01:00
Sipke Schoorstra
6e42065bac Simplified recipe step configuration names. 2015-07-20 10:55:21 +01:00
Sipke Schoorstra
1084c945dd Implemented Configure method for CustomStepsStep. 2015-07-20 10:27:10 +01:00
Sipke Schoorstra
a971f2825d Added Recipe Category to Recipe Metadata builder step. 2015-07-19 23:41:34 +01:00
Sipke Schoorstra
46d88feb0c Added IsVisible property to recipe builders to control their visibility. 
This is useful for builder steps that should only be rendered when there's actually something to render.
For example, the Custom Steps step should only be visible if there actually are any custom steps available for execution.
 2015-07-19 23:36:37 +01:00
Sipke Schoorstra
531f8bc352 Setting Enabled Feature setting to true by default on Feature recipe builder step. 2015-07-19 23:24:03 +01:00
Sipke Schoorstra
6a07fae67f Improved export file name generation. 2015-07-19 23:21:27 +01:00
Sipke Schoorstra
db48f60fe6 Fixed a typo in the Content recipe execution step description. 2015-07-19 23:14:59 +01:00
Sipke Schoorstra
c59a056524 Setting BatchSize to a reasonable default value on the Content Recipe Execution Step. 2015-07-19 23:13:42 +01:00
Sipke Schoorstra
32a5082405 Removed checkbox for Recipe Execution Steps. 
Since recipe execution steps are always to be configured and executed, there's no need for a checkbox.
 2015-07-19 23:10:13 +01:00
Sipke Schoorstra
00dc6ab13c Minor UI changes. 2015-07-19 23:06:10 +01:00
Sipke Schoorstra
ed85e96621 Replaced ResetSite checkbox with radio buttons. 
This should make things more clear to the user.
 2015-07-19 23:03:57 +01:00
Sipke Schoorstra
833d297499 Removed extraneous curly brace. 2015-07-19 22:45:20 +01:00
Sipke Schoorstra
21629dd6c2 Removed ImportExportCurrentTheme feature. 
Removed this feature in favor of it being part of the default feature of the module.
 2015-07-19 21:45:35 +01:00
Sipke Schoorstra
c0469aea85 Removed unused feature declarations. 2015-07-19 21:44:40 +01:00
Sipke Schoorstra
942700cf5c Merge branch 'dev' into feature/recipesteps 2015-07-19 20:03:30 +01:00
Sébastien Ros
e964d80f7e Merge pull request #5537 from jtkech/patch-1 
#5512: Incorrect message of DynamicForms StringLength rule if only Maximum is specified
 2015-07-19 09:58:24 -07:00
Nicholas Mayne
1e62b2b9f8 Merge pull request #5526 from yw80/1.9.x 
Correct code indentation format for file IndexingTaskExecutor.cs
 2015-07-19 17:53:25 +01:00
Nicholas Mayne
1732c333c2 Merge pull request #5540 from jchenga/issues/5539 
[Fixes #5530] YSOD instead of the set up page in Azure.
 2015-07-19 17:51:45 +01:00
Jack Cheng
a01d219607 [Fixes #5530] YSOD instead of the set up page in Azure. 2015-07-19 09:23:18 -07:00
sfmskywalker
b6082325f6 Fixed that Default recipe was no longer selected by default on setup screen. 2015-07-19 12:55:17 +01:00
Daniel Stolt
83cae5f0a0 #5536: Removed dependency on IContentManager from FormsAuthenticationService. 
FormsAuthenticationService now uses IMembershipService instead. Also introduced a NullMembershipService implementation in Orchard.Framework, used only for dependency resolution during setup. Fixes #5536.
 2015-07-18 22:05:39 +01:00