lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,160 Commits 83 Branches 32 Tags
162ec9410c4afb77110160896cc9bdbfc8b20e13
Commit Graph

10160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baruch Nissenbaum
1584bf703b Additional Module and Theme directories (squashed commit) 2015-10-24 20:05:21 +03: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
968e6b965b Merge pull request #5963 from RoyalVeterinaryCollege/5962 
[Fixes #5962] Last tag cannot be deleted
 2015-10-19 16:36:50 -07: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
Jeff
53d4f9eafa Fixes #5962. Add any tags that are no longer selected but were initially on page load. 2015-10-18 23:27:46 +01:00
Nicholas Mayne
fb4ecff18e Andout Count to Any and removing usings 2015-10-18 20:52:52 +01:00
Nicholas Mayne
452c03fa6f Changing Count for Any 2015-10-18 20:43:54 +01:00
Nicholas Mayne
98ae7172ff Removing NHibernate dependency from Recipies 2015-10-18 19:00:46 +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
Sebastien Ros
e6215a93b3 Fixing build 2015-10-15 17:58:19 -07: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
07c539e749 Merge remote-tracking branch 'origin/dev' into dev 2015-10-15 15:08:45 -07:00
Sebastien Ros
f1cd6aa38d Merge branch '1.9.x' into dev 
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
 2015-10-15 15:07:19 -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
260d0efaf6 Merge pull request #5926 from JRKelso/patch-3 
[Fixes #5885] Validating permalink length
 2015-10-15 12:23:16 -07: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
687026d727 Merge pull request #5898 from kumards/dev 
Fixing threading issue in OrchardLog4netLogger
 2015-10-15 12:17:44 -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
Ryan Kelso
74a5c8d2aa Fixes error message wording problem 2015-10-14 13:47:01 -04:00
Sébastien Ros
c66dafc460 Merge pull request #5922 from rtpHarry/orchardexe-help-filter 
Make orchard help command more intuitive

Closes #422
 2015-10-14 09:16:28 -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
Sipke Schoorstra
d6c4d648a6 Refactored content handler invocations using Invoke. 2015-10-13 21:29:19 +02:00
Sipke Schoorstra
161ac92c9e Removed unused Guid property from LayoutRecord. 2015-10-13 20:41:05 +02:00
Sipke Schoorstra
5344ed2e2a Fixed order of exported content part elements. 
This fixes an issue where the LayoutPart XML element would appear last in the content item XML element due to the fact that the <LayoutPart> element was being added only in the Exported event and not in the Exporting event.

To fix this, the <LayoutPart> element is no first added during the Exporting event, and later updated in the Exporting event.
 2015-10-13 20:17:03 +02: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
Daniel Stolt
40156e5be1 Merge pull request #5872 from OrchardCMS/issue/5848/importexport 
Refactored Import process.
 2015-10-12 21:39:21 +02:00
Sipke Schoorstra
51fe8fecb9 Added ImportCompleted event to field drivers too. 2015-10-12 21:37:04 +02:00
Sipke Schoorstra
ed78338e4e Merge branch 'dev' into issue/5848/importexport 2015-10-12 21:27:37 +02:00
Sipke Schoorstra
98c8101891 Added batch label to log messages. 2015-10-12 21:24:37 +02:00
Sipke Schoorstra
80a51561b5 Added CompleteImport to IContentManager. 
This makes it easier for other places that leverage the Import method to also invoke the CompleteImport method.
 2015-10-12 21:22:44 +02: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