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
9,333 Commits 94 Branches 33 Tags
dd9d67fe48b8fc4ebc94b53501f95805dd9ab05c
Commit Graph
9333 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros dd9d67fe48 Merge pull request #5952 from dcinzona/patch-2 
Fixes #5896 - AzureFileStorageProvider
 2015-10-15 11:36:49 -07:00
Sébastien Ros 9105187f78 Merge pull request #5950 from mattcowen/1.9.2 
Fix for orchard issue #5869
 2015-10-15 11:19:12 -07:00
Sébastien Ros 52c6debc97 Merge pull request #5937 from dcinzona/patch-1 
Fixes for #5936 #5938 #5941 and #5891
 2015-10-14 09:11:08 -07:00
Sébastien Ros f3be4fa2c7 Merge pull request #5946 from dcinzona/azure.storage-5.0.2.0 
[Fixes #5935] Updates Azure.Storage to 5.0.2.0
 2015-10-14 09:08:56 -07:00
Gustavo Tandeciarz d64541d47a Fixes #5896 - AzureFileStorageProvider 
Needs verification that this will not break anything else - don't think it will.
 2015-10-14 10:15:06 -04:00
mattcowen 9714c2c5f0 Fix for orchard issue 5869 2015-10-14 11:47:56 +01:00
dcinzona 855d183be3 Fixes #5935 Updates Azure.Storage to 5.0.2.0 2015-10-13 15:38:57 -04:00
Gustavo Tandeciarz a37e548b25 Update media-library.js 
Fixed typo
 2015-10-13 07:26:52 -04:00
Gustavo Tandeciarz 99695f07cc Update media-library.js 
Adjusted for default dimention based on window width (css media query)
fixed class lookup as .thumbnail has 0 height on load.
 2015-10-13 07:26:13 -04:00
Gustavo Tandeciarz 63ca6ee2d8 Media Library Recents - Fixes issue #5938 
The Recents link doesn't work when rootMediaFolder is null.
 2015-10-12 15:07:57 -04:00
Gustavo Tandeciarz 042c47cc3f Media Library - Fixes issue #5941 
Sets the opacity of the list items in the media library to .3 when new items are loading.
 2015-10-12 15:05:39 -04:00
Gustavo Tandeciarz 49ab41d4dc Fixes issue #5936 - page count = infinity 
Sets defaults to 200 if any dimension = 0
 2015-10-12 14:15:50 -04:00
Sebastien Ros 9c88c7fcd1 Fixing draft indexation 2015-10-02 15:44:35 +02:00
Sebastien Ros 62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Sébastien Ros 8ed39703e5 Merge pull request #5864 from Garpo001/patch-1 
Serialization error is thrown when creating layout or page in the dashboard when using Layouts in a Web Farm.
 2015-09-28 09:38:04 -07:00
Gert Smith a3ded18eb6 Update ElementSessionState.cs 
Make Model Serializable for use in Web Farms with session state stored in a database. Currently a Serialization error is thrown when creating layout or page in the dashboard.
 2015-09-26 10:52:39 +02:00
Sebastien Ros 5b0efdba58 Excluding long running tests from Test step 2015-09-25 16:00:10 -07:00
Sebastien Ros 8865041a8b [Fixes #5820] Fixing default layout support 
The default layout was just set in the text editor, and would not be
taken into account if the Part settings were not saved. A user would
then think the default template was there but actually not.

The change here is to leave the text editor empty, and if the setting is
empty load the default from the service. To actually have an empty template
a user needs to provide an empty object.
 2015-09-25 15:07:56 -07:00
Sebastien Ros d9e833ba58 [Fixes #5112] Removing Layout dependency on TinyMce 2015-09-25 15:05:33 -07:00
Sebastien Ros 9137414305 [Fixes #5819] Fixing column element default size 2015-09-25 15:04:06 -07:00
Sebastien Ros eb9bfa0d29 Merge branch 'feature/webpi' into 1.9.2 2015-09-24 09:10:44 -07:00
Sebastien Ros 1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
Sebastien Ros 7a289ca1ad [Fixes #5846] Saving settings would reset Markdown part settings 2015-09-23 17:12:59 -07:00
Sebastien Ros b7a0b007e4 [Fixes #5835] Restoring cache invalidation propagation 2015-09-23 16:14:19 -07:00
Sebastien Ros f2fb1d520d Preventing concurrency when monitoring extensions 2015-09-23 10:17:17 -07:00
Sebastien Ros 248cc7ecde Updating webpi package files 2015-09-21 15:29:31 -07:00
Sébastien Ros bb41f1f559 Merge pull request #5831 from OrchardCMS/feature/ownmedia 
Implementing own media management
 2015-09-21 15:08:19 -07:00
Sébastien Ros 5903f75665 Merge pull request #5828 from OrchardCMS/feature/layoutpermission 
Adding ManageLayout permission
 2015-09-21 15:07:57 -07:00
Sébastien Ros 46182edc5d Merge pull request #5827 from rtpHarry/1.9.x 
[Fixes #5826] Restore placements confirmation message fix
 2015-09-21 14:36:44 -07:00
Sebastien Ros accd4196dc Implementing own media management 2015-09-21 14:09:37 -07:00
Sebastien Ros d3d85f3519 Adding ManageLayout permission 2015-09-21 14:04:37 -07:00
Sébastien Ros 6e90f704f8 Merge pull request #5833 from mjy78/issue/5829 
[Fixes #5829] Cannot delete spam comment when viewing comment details
 2015-09-21 13:02:32 -07:00
Sébastien Ros 497b782a6a Merge pull request #5837 from mjy78/issue/5836 
#5836 Fix null ref exception in CommentPartDriver
 2015-09-21 12:58:01 -07:00
Sebastien Ros bc935f18b3 Fixing unit tests 2015-09-21 12:45:57 -07:00
Sebastien Ros 12a51ea7af [Fixes #5751, #5794] Removing Edit inline 2015-09-21 12:08:19 -07:00
Sebastien Ros f0b1639143 [Fixes #5616] Revert "Using master content item to create translations" 
This reverts commit fa09e2e83a.
 2015-09-21 11:27:46 -07:00
myates 9bb95efaaa #5836 Fix null ref exception in CommentPartDriver 2015-09-21 10:26:14 +10:00
myates e6c042d1a0 Fix build error 2015-09-19 22:03:12 +10:00
myates df583ea571 Merge branch 'Orchard-1.9.x' into issue/5829 2015-09-19 21:20:21 +10:00
myates adbab55ffc Comment service now fetches latest (instead of published) when deleting a comment. 2015-09-18 16:45:10 +10:00
Matthew Harris 20fbd99658 updated all instances of RemoveUrl checks 2015-09-17 22:58:58 +01:00
Matthew Harris d9a0e040c1 don't overwrite confirmRemoveMessage 2015-09-17 22:54:47 +01:00
Matthew Harris 4aaf4d34d0 amends based on PR feedback 2015-09-17 21:58:12 +01:00
Matthew Harris 7143792c0e fix #5826 2015-09-17 19:44:25 +01:00
Sebastien Ros 4214329a1f Prevent unnecessary db calls for containers 2015-09-16 17:52:33 -07:00
Sebastien Ros 921b2472f1 Adding filter for own content 2015-09-16 17:52:27 -07:00
Sebastien Ros 9e9e19c439 Add setting to hide Container editor 2015-09-16 17:52:13 -07:00
Sebastien Ros f3595881fe Hide taxonomy link if permission is not granted 2015-09-16 17:52:04 -07:00
Sebastien Ros ba36eae848 Prevent MediaLibrary popup without permissions 
If the user doesn't have ManageMedia permissions,
the markdown editor will use a specific image editor.
 2015-09-16 17:51:50 -07:00
Sebastien Ros 0bf76dc7ac Implementing a positioned wrapper for text elements 
When adding a text directly to a zone, the position will now
be taken into account. This is also useful for the Capture feature.

Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-16 17:51:23 -07:00