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

9559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sipke Schoorstra
8dd6b52909 Minor Autoroute cleanup. 2015-07-21 16:08:07 +01:00
Sipke Schoorstra
b5bc89cb21 Implemented import/export step for home alias. 2015-07-21 16:04:28 +01:00
Sipke Schoorstra
f60643d460 Fixed an issue with old aliases being kept in memory. 2015-07-21 13:11:24 +01:00
Sipke Schoorstra
a9ff7d5973 Simplified autoroute part import and added renamed IsHomePage to PromoteToHomepage. 2015-07-21 12:06:34 +01:00
Sipke Schoorstra
8f302d1b90 Updated Autoroute part, driver and handler to simplify setting the homepage. 2015-07-21 11:53:25 +01:00
Sipke Schoorstra
32584416b9 Introduced IHomeAliasService to deal with managing the home page. 2015-07-21 11:52:09 +01:00
Sipke Schoorstra
2dad35731e Fixed alias remove method. 2015-07-21 11:51:07 +01:00
Sipke Schoorstra
adc7bc1b53 Commented out everything that changes the alias of a content item. 2015-07-21 10:17:15 +01:00
Sipke Schoorstra
ad35d78126 Applied proper casing. 2015-07-21 10:16:25 +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