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,400 Commits 94 Branches 33 Tags
6e485a5873482216e65d477c8a20270aa6cf931d
Commit Graph
9400 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
neTp9c 6e485a5873 fix 2015-12-01 01:56:10 +03:00
Sébastien Ros db1efab940 Merge pull request #6060 from mkinawy/issue/6052 
[Fixes #6052] Href should be no-op when applied on absolute url
 2015-11-20 14:17:12 -08:00
mkinawy d0175e6ccd reverting file annotations 2015-11-21 00:12:36 +02:00
mkinawy 23d81181ed fixes #6052 by making Href return the url path as-is if it starts with http or https 2015-11-21 00:07:08 +02:00
Sébastien Ros def163953c Merge pull request #6057 from mkinawy/issue/5978 
[Fixes #5978] Move Select button at the top in modal Media Library frame
 2015-11-20 12:09:13 -08:00
mkinawy 4db088fb9c fixes #5978 by moving the select button to the top of the media picker window and hides the save button untill some image is selected 2015-11-20 21:08:10 +02:00
Sébastien Ros a02e6e8ab7 Merge pull request #6055 from MpDzik/pr/tokens-1.9.x 
Fix TextTokens - Format and TrimEnd
 2015-11-19 14:40:31 -08:00
Marek Dzikiewicz b3bf80395a Fix TextTokens - Format and TrimEnd 
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
 2015-11-19 23:01:50 +01:00
Sébastien Ros f701482ff9 Merge pull request #6044 from DanielLackenbyBede/daniellackenbybede/bug/6043/listable_content 
[Fixes #6043] Filter out when no contentTypeNames provided
 2015-11-19 12:25:05 -08:00
Sébastien Ros bd00caf5be Merge pull request #6050 from Codinlab/fixes/6023 
Fixes #6023 : Ellipsize can spilt an HTML encoded character
 2015-11-19 12:19:11 -08:00
Lombiq b32fc1b7ba Adding proper end of line handling when cloning from Mercurial 2015-11-19 13:58:47 +01:00
Thierry Fleury 411e04b56a Make Excerpt test more accurate 2015-11-19 09:29:35 +01:00
Thierry Fleury 062a786f61 Add new HtmlHelperExtensions tests for Ellipsize and Excerpt methods 2015-11-19 09:00:31 +01:00
Thierry Fleury 5bfb858e3b Use non-breaking space instead of standard space in Ellipsize. 2015-11-19 08:58:49 +01:00
Thierry Fleury ccaa47b200 Fixes #6023 : Ellipsize can spilt an HTML encoded character 2015-11-18 19:33:18 +01:00
Daniel Lackenby c6b1754bd7 Limit Admin Menu for Content 
Limit the Content Menu item by whether you have the base Permission
EditOwnContent. EditContent implies EditOwnContent so either permission
(which you need at least one of to do any management of content be it
create or edit) will allow this menu item to display.
 2015-11-18 16:08:50 +00:00
Daniel Lackenby 4946252f7e Filter out when no contentTypeNames provided 
Previously, when no content type names where provided (from a prior
conditional statement, so there is an initialized array but it is empty)
then the filtering steps are skipped and instead of serving "no content
types", as an empty array would state: all content types are served.
When contentTypeNamed.Length == 0, still .Select() as this is safe for
empty collections and will filter out all types in this event.
 2015-11-17 15:47:41 +00:00
Daniel Stolt 500255c3b1 Merge pull request #6028 from mvarblow/patch-3 
Update CacheItemRecord.cs

Fixed database output cache module when using SQL Server database. This resolves the following exception which results from NHibernate trying to truncate the Output field to 8K: NHibernate.AssertionFailure: null id in Orchard.OutputCache.Models.CacheItemRecord entry (don't flush the Session after an exception occurs)
 2015-11-11 18:36:18 +01:00
mvarblow 67096961ce Update CacheItemRecord.cs 
Fixed database output cache module when using SQL Server database.  This resolves the following exception which results from NHibernate trying to truncate the Output field to 8K:

NHibernate.AssertionFailure: null id in Orchard.OutputCache.Models.CacheItemRecord entry (don't flush the Session after an exception occurs)
 2015-11-11 12:19:59 -05:00
Sipke Schoorstra 06ee7849c1 Removed tokenization from dynamic form error messages. 2015-11-03 22:34:11 +01:00
Sipke Schoorstra 61c91ff858 Merge pull request #5884 from phillipsj/1.9.x 
Resolves #5878 : URL Field for Dynamic Forms
 2015-11-03 22:08:22 +01:00
Lombiq 92cbf8925b Merge branch 'master' into 1.9.x 2015-11-03 21:38:19 +01:00
Lombiq c8b7c64d93 Changing DotNest casing to the official one in the Readme 2015-11-03 21:37:13 +01:00
Lombiq 9572ef9ad3 Removing unnecessary Web.config file from the unused "Orchard.Dashboards" module folder, #6010 
Fixes #6010
 2015-11-03 21:25:51 +01:00
Sipke Schoorstra 388932b41f Merge pull request #5992 from harmony7/LayoutEditorSaveJquery 
With the Element editor dialog, use dialog iframe's jQuery for form submission
 2015-10-29 14:27:57 +01:00
Katsuyuki Ohmuro 829f69198c With the Element editor dialog, use dialog frame's jQuery for form submission. 2015-10-29 21:40:47 +09:00
Jamie Phillips 4648a252b9 Correcting formatting and handling of error message. 
Corrected the formatting and correct the handling of the error message.
 2015-10-23 17:12:24 -04:00
Sébastien Ros 219f29cd20 Merge pull request #5972 from rtpHarry/patch-4 
Revamp readme.md and update version to 1.9.2
 2015-10-22 12:20:48 -07:00
Sébastien Ros 51003bf582 Merge pull request #5967 from carlwoodhouse/redis-patch 
[Fixes #5958] Improving Redis extensions use of keys
 2015-10-22 12:19:26 -07:00
Sebastien Ros 0d5cff66a9 Fixing Azure Portal integration 2015-10-21 14:41:41 -07:00
Lombiq 7e66c98dd5 Adding the ability to add a menu item under another item directly, #4009 2015-10-21 19:52:03 +02:00
Jamie Phillips 14c2ee7944 Updating Validation Message for URL Field 
This change is made to now be in sync with the recent changes to how validation messages are being handled.
 2015-10-20 20:34:23 -04:00
Matthew Harris 9ae372a920 revamp and update version to 1.9.2 
It was still talking about the project in the context of v1 and had a duplicate section about getting involved
 2015-10-21 00:11:42 +01:00
Carl Woodhouse eecb61a132 Redis extensions use of keys #5958 2015-10-20 12:35:34 +01:00
Sébastien Ros 4574a9fb0b Merge pull request #5915 from rtpHarry/patch-1 
[Fixes #5912] Improve warning css in multi-tenant edit
 2015-10-19 16:35:44 -07:00
Matthew Harris bec9a6d792 Merge branch '1.9.x' into patch-1 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
 2015-10-20 00:09:16 +01:00
Kegan Maher dbe89d0a82 avoid null exception in AzureBlobStorageProvider.GetStoragePath, fixes #4402 2015-10-16 14:19:39 -07:00
Sipke Schoorstra 255547288b Fixed T usage in ValidationRules, round 2. 2015-10-16 10:45:08 +02:00
Lombiq a9abc294e3 Fixing that module tests codegen created projects with the old .NET framework version 2015-10-15 15:51:44 -07:00
Sebastien Ros 101d61b808 Merge branch 'master' into 1.9.x 2015-10-15 15:00:14 -07:00
Sipke Schoorstra 054925c297 Fixed T usage in ValidationRules. 2015-10-15 21:47:01 +02:00
Sébastien Ros ff97d1e975 Merge pull request #5918 from rtpHarry/patch-3 
[Fixes #5908] Triple columns don't fit on small screens
 2015-10-15 12:22:16 -07:00
Sébastien Ros e26fee3d6c Merge pull request #5844 from escofieldnaxos/feature/Content-Picker-MultiSelect 
Enhancement to allow multi-select for the content picker
 2015-10-15 12:09:10 -07:00
Sebastien Ros ec0ea5e321 Updating ManageOwnMedia defaults 
Fixes #5894
1.9.2 		2015-10-15 11:41:07 -07:00
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
Nicholas Mayne 1da6066e83 Merge pull request #5921 from rtpHarry/fix-m-ui-glitch 
fix multitenancy ui glitch - fixes #5913
 2015-10-15 08:41:56 +01: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