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

9556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Thierry Fleury
0e7f864d4d Fixes #5519 : DynamicForms client validation 2015-07-21 12:17:58 +02:00
Murray Hou
14cdf57bc5 Fixed DropForeignKeyCommand For Mysql 2015-07-21 15:48:54 +08:00
Murray Hou
41e9fda2de Fixed [default value] For Mysql 
The [default value] can'nt use [modify column] in mysql.
 2015-07-21 15:38:21 +08: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