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 2 Packages Projects Releases Wiki Activity
9,682 Commits 94 Branches 33 Tags
3183df5b4ad6f4033984b7b1bfd4fdcf3b6d9ddf
Commit Graph
9682 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sipke Schoorstra 805de7d563 Removed unnecessary check for "/". 
The DisplayAlias of a content item will not be set to "" or "/" for the item to become the homepage, so there's no need to check for the display alias to be "/".
 2015-07-26 17:16:41 +01:00
Sipke Schoorstra 8aa2a9f070 Fixed autoroute part editor template. 
This fixes an issue where the alias text field becomes hidden when the content is the homepage, while given the home alias updates you should still be able to change the alias of the content item.
 2015-07-26 17:10:09 +01:00
Sipke Schoorstra c4ff7a21f3 Removed unused namespace. 2015-07-26 17:06:33 +01:00
Sipke Schoorstra 2317d6a737 Update FrontEndCultureSelector shape template to accommodate home alias changes. 2015-07-26 16:19:38 +01: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 6566c11880 Fixed bad merge. 2015-07-24 15:01:16 +01:00
Sipke Schoorstra 0d3f525610 Simplified accessing the localizable aspect and elaborated a bit on the hack. 2015-07-24 14:57:19 +01:00
Sipke Schoorstra e8cc0cba6e Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/ImportExport/HomeAliasExportStep.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
	src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
	src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
	src/Orchard/Localization/Services/DefaultDateFormatter.cs
	src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
 2015-07-24 14:11:00 +01:00
Sipke Schoorstra f575944df3 Updated Page commands to create home page alias. 2015-07-24 13:52:38 +01:00
Sipke Schoorstra 4159584d85 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-07-24 13:33:36 +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
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