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,489 Commits 94 Branches 33 Tags
d925fd31dccf3efc7a74282b3ceda7baad35a97d
Commit Graph

5736 Commits

Author SHA1 Message Date
Lombiq
d925fd31dc Adding orphaned files to their respective csprojs. Fixes #6366 2016-02-10 23:43:47 +01:00
Daniel Stolt
202234bf0b Refreshed all Gulp-compiled resource files. 2016-02-09 23:47:56 +01:00
Daniel Stolt
36f701625c Refactored the resource manifest for jQuery UI. 2016-02-09 23:47:22 +01:00
Sébastien Ros
dfaaf61f88 Merge pull request #6349 from infofromca/fix6343 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 09:00:00 -08:00
neTp9c
66f500e2d7 Treatment null value for params argument 2016-02-09 13:50:09 +03:00
Daniel Stolt
51ad9fc792 Merge pull request #6356 from infofromca/fix6354 
#6354: delete one duplicate definition of script for jQueryUI for orchard 1.10
 2016-02-07 23:26:48 +01:00
andy zheng
4401fb1e7f delete one duplicate definition of script for jQueryUI 2016-02-07 07:42:47 -05:00
Daniel Stolt
a584b27c35 Changed to manual bootstrapping of LayoutEditor Angular app. Fixes #5722. 2016-02-06 23:54:40 +01:00
Daniel Stolt
1b02c5c03c Fixed errors in jQuery resource manifest. 2016-02-06 23:53:15 +01:00
andy zheng
8278901e22 fix #6343 2016-02-05 19:37:48 -05:00
Sebastien Ros
c8ab7f187f Fixing jQuery UI resources 
#6329
 2016-02-04 13:43:07 -08:00
Sebastien Ros
0c6bcb52e9 [Fixes #6329] Fixing fonts file location in Orchard.Resources 2016-02-04 13:43:06 -08:00
Sebastien Ros
57fd0f6244 [Fixes #6328] Using FontAwesome from Orchard.Resources 2016-02-04 13:43:05 -08:00
Sebastien Ros
4cabab9c6d [Fixes #6327] Removing TaskLease dependency in JobsQueue 2016-02-04 13:43:04 -08:00
Sipke Schoorstra
96a4af5a68 Removed unneeded HTML file. 2016-02-04 21:28:27 +01:00
Sebastien Ros
3630473e69 Removing roslyn compilation for now 2016-02-01 11:55:04 -08:00
Sebastien Ros
9916037d8e Updating version numbers 2016-02-01 10:13:05 -08:00
Sebastien Ros
b3b4b38229 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
	src/Orchard.Web/Web.config
 2016-02-01 10:12:06 -08:00
Sebastien Ros
c890f5b5c6 Updating version number 2016-02-01 10:07:18 -08:00
Sebastien Ros
52aade5411 Removing unused references 2016-02-01 10:03:13 -08:00
Sebastien Ros
a14b006d70 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard/ContentManagement/DefaultContentManager.cs
 2016-02-01 09:36:47 -08:00
Sebastien Ros
77f4382fe8 Merge branch '1.9.x' into 1.9.3 2016-02-01 09:33:22 -08:00
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
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