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 1 Packages Projects Releases Wiki Activity
10,524 Commits 94 Branches 33 Tags
1def97d9ce1e16f3cb1fd400a7c16a0f7fc8e383
Commit Graph

5762 Commits

Author SHA1 Message Date
Lombiq
f44ddc623c Instead of an isBreadcrumb parameter we now use BreadcrumbMenuItemPart to distinguish breadcrumb-only menu items 2016-01-29 17:03:07 +01:00
Sipke Schoorstra
cb572e0bed Merge pull request #6139 from neTp9c/ImportExportMenuElement 
Import and Export for menu element.
 2016-01-29 00:48:16 +01:00
Sipke Schoorstra
91fdba1e2c Added LegacyRulesEvaluator. 
This will handle third-party modules that still implement the deprecated IRuleProvider.
 2016-01-28 23:15:13 +01:00
Sébastien Ros
bdca8a5564 Merge pull request #6298 from Codinlab/features/roleCondition 
Move RoleRuleProvider to RoleCondition
 2016-01-28 12:24:38 -08:00
Lombiq
cce9b3172e Implementing Alias Breadcrumb Link to be able to add dynamically generated breadcrumb menu items for content items not being in the menu hierarchy, see #3537 2016-01-28 21:07:27 +01:00
Nicholas Mayne
58d480b87c Merge pull request #6140 from neTp9c/CultureConditions 
Culture condition provider
 2016-01-25 11:40:02 +00:00
neTp9c
77f92bcbbe Move implementation of CultureConditions to CultureRuleProvider class 2016-01-25 14:22:20 +03:00
neTp9c
17fc2bb02d Change OnImportCompleted to OnImporting 2016-01-25 14:02:24 +03:00
Daniel Stolt
80a9cc73b8 Untabified module manifests according to #6072. 2016-01-22 20:46:45 +01:00
Daniel Stolt
16c687d8b1 Cleaned up and reformatted all Web.config files according to #6072. 2016-01-22 20:38:34 +01:00
Thierry Fleury
df3e25a659 Remove Orchard.Events reference 2016-01-22 08:07:14 +01:00
Thierry Fleury
e519e2dc36 Move RoleRuleProvider to RoleCondition 2016-01-22 08:07:14 +01:00
Sébastien Ros
899379e94a Merge pull request #6290 from armanforghani/patch-1 
Updated feed URL for Orchard gallery.
 2016-01-21 14:28:21 -08:00
armanforghani
9da248871f Updated feed URL for Orchard gallery. 
Fixes #6289
 2016-01-22 01:35:43 +03:30
Sébastien Ros
2d66897ce7 Merge pull request #6172 from SzymonSel/dev 
[Fixes #6168] Generating TechnicalName for ContenTypes, ContentFields …
 2016-01-21 12:19:29 -08:00
Rob King
b5e40c262f Moved Mono.CSharp reference to NuGet 2016-01-21 15:42:59 +00:00
Hannan Azam
ceed1a04d6 [Fixes #5689] Remove Alias when Item is Destroyed 2016-01-21 20:31:13 +05:00
Lombiq
6da6e7071a Removing unneeded System.Data.DataSetExtensions from Tokens that could cause assembly loading errors and flood the logs 2016-01-21 00:35:42 +01:00
Sipke Schoorstra
5f0e690874 Fixed reCaptcha driver. 
This fixes an issue where the reCaptcha driver would not add a model validation error in case captcha-validation failed, enabling bots to circumvent the validation altogether.
 2016-01-17 16:26:17 +01:00
Sebastien Ros
f47ce2a5f0 Using case insensitive route values comparison 2016-01-15 09:15:34 -08:00
Sebastien Ros
567756b697 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
 2016-01-15 09:01:39 -08:00
Sebastien Ros
eb7574df0b [Fixes #6248] Prevent users from renaming their root folder 2016-01-15 08:55:32 -08:00
Szymon Seliga
7ca31ab097 Replaced regex with a while loop 2016-01-15 16:50:25 +01:00
Szymon Seliga
7bb8868146 Merge remote-tracking branch 'origin/dev' into dev 2016-01-15 16:11:32 +01:00
jtkech
7237437c14 Update FrontEndCultureSelector.cshtml 2016-01-15 03:13:20 +01:00
Sebastien Ros
f17f2c3a93 [Fixes #6279] Adding confirmation for deleting taxonomies 2016-01-14 17:52:07 -08:00
Sebastien Ros
ec0b4b1a4b Fixing homepage service 
Fixes #6263
Fixes #6273
 2016-01-14 17:35:15 -08:00
Sébastien Ros
c6b9d36c41 Merge pull request #6268 from leventesen/update/contentpicker-edit-link 
[Fixes #6267] Use admin link for ContentPicker
 2016-01-14 12:10:58 -08:00
Sebastien Ros
2d4c87d1d7 Fixing unit tests 2016-01-14 09:39:51 -08:00
Sebastien Ros
a0c61c0328 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
 2016-01-14 08:50:24 -08:00
Sebastien Ros
e510ec2998 Removing unknown binaries 2016-01-13 17:58:11 -08:00
Sebastien Ros
e587a48e75 White-listing packages.config as None target in projects 2016-01-13 17:34:29 -08:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Daniel Stolt
c59b761c3a Enabled Roslyn compilation (C# 6 syntax support) for Razor views. 
- Added Roslyn CodeDom Nuget packages to Orchard.Web and Orchard.Azure.Web.
- Added the necessary Web.config section to all modules/themes to make the VS editor recognize C# 6 syntax.
- Added a sample/proof use in BadgeOfHonor.cshtml.
 2016-01-14 00:48:22 +01:00
Sebastien Ros
fe121a81f1 [Fixes #5728] Adding default grid system to TheThemeMachine 
Breaking change: Existing themes relying on Layout and TheThemeMachine
will need to add a reference to this css.
 2016-01-13 15:47:39 -08:00
Sebastien Ros
e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Daniel Stolt
bfb01a31d5 Fixed compiler errors in Razor views in modules and themes. 
A handful of compiler errors would appear in most modules while having Razor views open in Visual Studio 2015. Adding a reference to System.Core in Web.config of modules fixes this.
 2016-01-14 00:09:15 +01:00
Sebastien Ros
a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
armanforghani
ee54d4237f Update LayoutEditor.cshtml. 
Wrapped strings in T delegate.
Fixes #6269
 2016-01-11 16:03:35 +03:30
Levent Esen
2d2b4a0563 Update ContentPicker.Edit.cshtml link 
Update for issue #6267
 2016-01-11 02:22:35 +02:00
Sébastien Ros
76e55c3d16 Merge pull request #6217 from gcsuk/replace-lib-with-nuget 
[Fixes #6148] Replace lib with nuget
 2016-01-07 12:53:42 -08:00
Sébastien Ros
2d42c74395 Merge pull request #6207 from Codinlab/features/2027 
[Fixes #2027] Add role rule  in Orchard.Widgets module
 2016-01-07 12:35:31 -08:00
Sébastien Ros
050b3e2acf Merge pull request #6187 from PaulDevenney/Bug/FixImportExportCommand 
[Fixes #6181] Fixed bad assumption about HttpContext
 2016-01-07 12:30:44 -08:00
Sébastien Ros
7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor 
Improving monitors usage for output cache
 2016-01-07 12:14:52 -08:00
Sébastien Ros
5dd54b6d55 Merge pull request #6125 from neTp9c/issue/6107 
[Fixes #6107] Fixing content permissions part
 2016-01-07 12:12:26 -08:00
Rob King
f440ebd03f Updated CodeGen templates 2016-01-07 16:11:00 +00:00
Rob King
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
Lombiq
79b0b809ca Fixing that when editing blog posts permissions were mistakenly checked for the blog instead of the post 2016-01-06 14:49:57 +01:00
Rob King
93ec5ea543 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 2016-01-06 10:36:08 +00:00
Lombiq
7fa4783b1d Fixing leftover MVC references by changing them to also use packages 2016-01-06 01:04:40 +01:00