lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-22 03:37:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,589 Commits 84 Branches 32 Tags
9fa1e1345772e8221722a549b5db6b0e2261e21e
Commit Graph

9932 Commits

Author SHA1 Message Date
Sebastien Ros
1205f3ae5a Merge branch 'dev' into 1.10 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2016-02-01 09:33:02 -08:00
saurabhrajguru
af1673ed9e Updated codeplex url with github url in modules 2016-02-01 12:57:13 +05:30
Sipke Schoorstra
59d20c3d40 Fixed an issue with rendering shapes from Orchard.exe. 
Fixes #6321
 2016-01-31 22:43:03 +01:00
Piotr Szmyd
52668d1beb [Fixes #6322] Supporting multiple scopes/contexts in .po file entries. 2016-01-31 18:22:33 +01:00
Sipke Schoorstra
b9fa87d5e2 Fixed an issue with a null BaseUrl during Setup from Orchard.exe. 
Fixes #6320
 2016-01-31 14:25:45 +01:00
Daniel Stolt
afc637452a Fixed the Log4net config release transformation. 2016-01-31 12:22:47 +01:00
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
Lombiq
dd9a0ec0f0 Removing now unused method from ContentPartDriver 2016-01-28 15:06:50 +01:00
Lombiq
110e5c1154 Fixing that when content fields were updated it wasn't checked whether previously they were displayed or not (as it happens for parts), fixes #6287 2016-01-28 00:13:30 +01:00
Lombiq
8daad7f7a9 Fixing that specifying a global zone as an editor shape's placement caused NRE, fixes #4913 
E.g. something like this didn't work: Parts_Title_Edit = "/Navigation: 5"
 2016-01-27 20:17:03 +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
Thierry Fleury
f3971484b8 Fixes #5593 : Dynamic Forms: In form settings HtmlEncode option is always checked 2016-01-23 10:32:22 +01:00
Daniel Stolt
80a9cc73b8 Untabified module manifests according to #6072. 2016-01-22 20:46:45 +01:00
Daniel Stolt
abaef1d765 Reformatted one more Web.config file. 2016-01-22 20:41:30 +01:00
Daniel Stolt
16c687d8b1 Cleaned up and reformatted all Web.config files according to #6072. 2016-01-22 20:38:34 +01:00
Hannan Azam
4f7a73c782 Check for Nullability of HttpContext while getting Client IP 2016-01-22 17:16:26 +05: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
Hannan Azam
00e2a8f9dc Changed the way Handlers are invoked in Export and Import 2016-01-21 15:32:46 +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
Sebastien Ros
8e8f95f25f Fixing localization of BadgeOfHonor 2016-01-19 15:54:02 -08:00
Sebastien Ros
17fbe37171 Adding missing module to functional tests 2016-01-19 14:44:41 -08:00
Sebastien Ros
00c35d9dbd Fixing specflow tests 2016-01-19 11:44:49 -08:00
Sebastien Ros
2586675cc1 Copying roslyn binaries before running Specflow tests 2016-01-19 10:43:45 -08: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
Piotr Szmyd
7057740787 Fixing issue with fetching a theme and rendering shapes from a background thread. 2016-01-16 00:13:24 +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
Sebastien Ros
163159dfd0 Merge branch '1.9.x' into dev 2016-01-14 13:19:45 -08:00
Sébastien Ros
40db1e2a84 Merge pull request #6236 from jtkech/patch-3 
[Fixes #6192] Using Lazy IWorkContextStateProvider
 2016-01-14 12:15:24 -08:00
Sébastien Ros
eb6f2f2752 Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums 
Added handling of nullable enums.
 2016-01-14 12:14:16 -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
ab89479508 Including msbuild tasks in lib 2016-01-14 12:04:45 -08:00