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 2 Packages Projects Releases Wiki Activity
9,036 Commits 94 Branches 33 Tags
02b889a92526c5aca6b9b5fec4e79954ec38fb5a
Commit Graph
9036 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros 02b889a925 Merge branch '1.8.x' into 1.x 2015-05-05 21:42:52 -07:00
Sebastien Ros 2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra e0aa89b668 Minor code file cleanup. 2015-05-04 18:00:55 +02:00
Sipke Schoorstra ba409819f2 #5237: Consistified media library breadcrumbs. 2015-05-04 17:59:38 +02:00
Daniel Stolt 12a95c0335 Fixed missing assembly binding redirects for Azure Storage. 1.9 2015-05-02 22:48:23 +02:00
Sipke Schoorstra 324214e812 Merge pull request #5232 from giannik/patch-2 
Fix for issue #5219
 2015-05-02 10:59:43 +02:00
yiannis kyriazidis ba9e1679b8 Fix for issue #5219 2015-05-02 11:38:40 +03: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
Nicholas Mayne a11c92ae50 Merge pull request #5230 from dcinzona/1.x 
Fix for issue #5228
 2015-05-02 08:44:11 +01:00
Gustavo Tandeciarz 7689fe7394 Fix for issue OrchardCMS/Orchard#5228 2015-05-02 02:08:43 -04:00
Sipke Schoorstra 379ac040e1 Fixed binding issue for Enumeration field when using RadioList. 
This fixes an issue when the Enumeration content field is configured to use radio buttons - in which case the editor shape will use the "Value" property instead of the "SelectedValues" property. Since the binding would only set the value through "SelectedValues", the stored value would be surrounded with a comma, which would not match with any of the enumeration values.
 2015-05-01 16:39:50 +02:00
Sébastien Ros cd479efdae Merge pull request #5213 from Skrypt/1.x 
Workflow Definition fixes
 2015-04-30 12:43:29 -07:00
Sébastien Ros b86f7146f8 Merge pull request #5208 from RoyalVeterinaryCollege/4977 
fixes #4977 Incorrect BlogPartArchive count
 2015-04-30 12:39:23 -07:00
Sébastien Ros fc09661fd6 Merge pull request #5206 from Ermesx/pr/deprecate-lazyField 
Make Orchard.Core.Common.Utilities.LazyField<T> [Obsolete]
 2015-04-30 12:37:26 -07:00
Sébastien Ros 1a9be8c57a Merge pull request #5202 from jtkech/patch-3 
#5113: SecureSocketsLayer, incorrect Hostname when port number is included
 2015-04-30 12:33:48 -07:00
Sébastien Ros f2f9d8c1ca Merge pull request #5201 from thekaveman/1.8.x 
Fix null exception in AzureBlobStorageProvider.GetStoragePath
 2015-04-30 12:32:10 -07:00
Sipke Schoorstra ceaa36c329 Fixed default layout data string for Form content type. 2015-04-30 18:09:52 +02:00
Sipke Schoorstra ce6876eacf Revived default layout data initialization. 2015-04-30 18:09:26 +02:00
Sipke Schoorstra a919aab936 Layout Canvas reusability improvements. 
This enables child canvas elements to be moved around and removed.
 2015-04-30 17:35:03 +02:00
Sipke Schoorstra ff461b3945 Added MenuPart to Form content type by default. 2015-04-30 17:29:15 +02:00
Sipke Schoorstra 5a5d2f9ae8 Added URL referrer safety check. 2015-04-30 17:28:49 +02:00
Sebastien Ros 72534d632d Adding more detailed message on failing tests 2015-04-29 15:15:43 -07:00
Sebastien Ros d941ea1509 Fixing failing culture based test on CI 2015-04-29 15:15:20 -07:00
Sebastien Ros 6ff69e27fd Fixing specflow tests 2015-04-29 13:04:19 -07:00
Sebastien Ros dd8d793a40 Adding unsafeUrl support in specflow tests 2015-04-29 13:04:08 -07:00
Sipke Schoorstra c7094ab46b #5215: Implemented import/export for *SearchFormPart*. 2015-04-29 20:32:50 +02:00
Sipke Schoorstra e6b84ad587 #5216: Added call to *InitHelpers*. 
This will cause various helpers to be initialized, such as the *Html* property.
 2015-04-29 20:30:08 +02:00
Skrypt af6282c275 Fixed #5118, #3998 : Adding Workflow Definition name string empty validation. 
Fixed #4716, #4367 : Adding Workflow Definition bulk delete.
 2015-04-28 23:56:21 -04:00
Sebastien Ros 6164729808 Fixing some specflow tests 2015-04-28 18:32:59 -07: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
Sebastien Ros cdd3722009 Forcing POST method on user moderation actions 2015-04-28 10:27:40 -07:00
Sipke Schoorstra 8dbd003f61 Implemented import/export for element definitions. 2015-04-28 18:10:45 +02:00
Wojciech Gadziński d273134df3 Fix formatting 2015-04-27 23:14:56 +02:00
Wojciech Gadziński 13fe3649a8 Added backward compatibility for LazyField 2015-04-27 18:32:47 +02:00
Jeff d3f5765f5b fixes #4977 Incorrect BlogPartArchive count 2015-04-27 16:20:23 +01:00
Sipke Schoorstra 6b18883e24 Merge branch '1.9-int' into 1.x 2015-04-27 16:11:28 +02:00
Sipke Schoorstra 02fbd2e1f2 Merge branch '1.8.x' into 1.9-int 2015-04-27 16:04:17 +02:00
Sipke Schoorstra e557151b28 Merge branch '1.8.2-int' into 1.8.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-04-27 16:01:10 +02:00
Sipke Schoorstra a88d68ee7a Added missing *Types* property to ContentPicker shape. 
This fixes an issue where you could not configure the content picker shape to filter the available content items by types or types with certain parts.
 2015-04-27 14:05:50 +02:00
Sipke Schoorstra ae17c75a5e Fixed controller for SELECT input controls. 
When using a SELECT input control, that control itself would be initialized with the call to "toggleWhatYouControl" instead of its child OPTION elements.
 2015-04-27 08:36:38 +02:00
Wojciech Gadziński b9973d91d8 Move all usages of LazyField to Orchard.ContentManagement.Utilities.LazyField 
There is one change which have to verify:
Orchard.ContentManagement.Handlers.StorageFilter
Orchard.ContentManagement.Handlers.StorageVersionFilter
because I removed _value parameter from loader delegate - it was pointless and used nowhere except above filters.
 2015-04-26 23:56:04 +02:00
Wojciech Gadziński 6afbc78395 Make Orchard.Core.Common.Utilities.LazyField<T> [Obsolete] 2015-04-26 23:23:11 +02:00
Wojciech Gadziński fa40f4d8b0 Cleanup formatting and references 2015-04-26 23:21:08 +02: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