lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,844 Commits 84 Branches 32 Tags
9f65be8e263ab5549f884ab88aedb9651895f413
Commit Graph

212 Commits

Author SHA1 Message Date
Sipke Schoorstra
f3a7aeffcb Merge branch '1.9.x' into dev 2015-07-23 11:44:57 +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
adc7bc1b53 Commented out everything that changes the alias of a content item. 2015-07-21 10:17:15 +01: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
86056e2e9c Added System.Web.WebPages assembly reference. 
This removes a warning displayed by the code editor.
 2015-07-18 19:31:20 +01:00
Sipke Schoorstra
4e61c3314d Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-07-04 14:35:41 +02:00
Sipke Schoorstra
eebe29fec3 #5467: Fixes the issue where the "Set as homepage" setting is not retained when saving, 
The issue was that when you save a content item (without publishing it) while checking the "Set as homepage" checkbox, it would lose its checked status after save.
With this change, the checkbox is again rendered but in a checked status, so that when you do publish, it will become the homepage.

Fixes #5467
 2015-07-02 13:01:49 +03:00
Sebastien Ros
1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sipke Schoorstra
18166bd274 Fixed KeyNotFoundException in AutoroutePart. 
This fixes the issue where the autoroute part fails after a clean Orchard setup.
 2015-06-27 13:38:44 +03:00
Sébastien Ros
1aefd0fdbd Merge pull request #5267 from Skrypt/autoroute-patterns-localization 
Autoroute patterns localization
 2015-06-25 12:12:06 -07:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Skrypt
c192ade6a9 Removing commented code in migration 2015-06-22 12:18:51 -04:00
Sebastien Ros
0e47295b9f Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
 2015-06-19 11:33:12 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Skrypt
34ddbbd371 Adding lazy update of patterns. Code optimizations. 
Commented out the migration patterns upgrade code.
 2015-06-14 21:18:57 -04:00
Skrypt
6e3d00b2d9 Optimization to support null values on culture instead of needing to set it to an empty string --> cleaner 2015-06-12 01:54:42 -04:00
Skrypt
8beec81217 Reverting changes in Migration. 
Adding String.IsNullOrEmpty instead of == ""
Fixed migration code to use ContentDefinitionManager only
Fixed return numbers on migration
using DefaultJsonConverter service in AutorouteSettings.cs
 2015-06-11 23:53:41 -04:00
Skrypt
23f3f29a47 Creating Patterns and Default Patterns for each culture installed when attaching an AutoroutePart to a Content Type. 
Related to issue #5195
 2015-06-07 21:12:11 -04:00
Skrypt
60ce2d777c Adding fix when we create a new Content Type and that we don't save any Pattern. We should save default patterns to each culture when we assign an AutoroutePart to a content type. 2015-06-07 18:34:42 -04:00
Skrypt
f8ab1c509e Adding migration of AutorouteSettings.DefaultPatternIndex to AutorouteSettings.DefaultPatternDefinitions 2015-06-07 18:14:12 -04:00
Skrypt
a721352797 Work on Migrations. 
Fixing view counter to check for pattern instead of pattern name since it can be empty.
 2015-06-06 02:14:01 -04:00
Skrypt
ab8162347e Fixing small bug when creating a new content type. The use culture checkbox click event whas not working because the ID can change depending on the order the parts have been added. Replaced the jQuery selector to a class instead. 2015-06-04 20:55:57 -04:00
Skrypt
202dbc3866 Adding the option to activate patterns per culture or not. Falling back to the default culture pattern(s) if not activated. 2015-06-03 22:37:29 -04:00
Skrypt
61fe66d806 Incremental work 2015-05-29 15:01:38 -04:00
Skrypt
059b6c38e0 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into autoroute-patterns-localization 2015-05-27 14:55:39 -04:00
Lombiq
d1ae7380e4 Removing empty Controllers folder from Autoroute 2015-05-22 00:19:16 +02:00
Lombiq
0283dc22c5 Warning users when they remove the home page, fixes #4843 2015-05-22 00:18:24 +02:00
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Skrypt
278c8c656a Merge branch '1.x' of https://github.com/OrchardCMS/Orchard into autoroute-patterns-localization 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-04-28 18:32:40 -04:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Skrypt
d2fc47eb2d Adding Horizontal Tab nagigation on Autoroute Patterns Localization settings. 
Fixing Token Picker CSS (vertical position).
 2015-04-28 13:49:48 -04:00
Sipke Schoorstra
363ae13ef7 #5137: Fixed homepage being lost when content with empty alias is removed. 2015-04-26 13:58:22 +02:00
Sipke Schoorstra
c9d30d6cc2 Merge branch '1.9-int' into 1.x 2015-04-25 10:31:55 +02:00
Sipke Schoorstra
20adb3bf51 Merge branch '1.8.x' into 1.9-int 2015-04-25 10:24:31 +02:00
Sipke Schoorstra
060720e92c Minor code formatting + cleanup. 2015-04-25 10:20:00 +02:00
Sipke Schoorstra
b2b2e1cf37 #5137: Fixed homepage being lost when content with empty alias is removed. 2015-04-25 10:13:04 +02:00
Skrypt
201408bd59 Rebase on 1.x 2015-04-21 03:35:36 -04:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sebastien Ros
5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00