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,081 Commits 94 Branches 33 Tags
e3026b199e98705cd2bf556dfe3d1b14ba4ce0ad
Commit Graph
10081 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra e3026b199e Added Priority setting to the Orchard.Setup module manifest. 
Fixes #5980
 2015-10-27 10:08:11 +01:00
Nicholas Mayne 169543b26f Removing duplicate recipe call 2015-10-26 22:32:42 +00:00
Lombiq db92e1a803 Adding a "Go back to where you were" link to post-registration pages, fixes #2295 2015-10-26 18:44:19 +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
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
Sebastien Ros e6215a93b3 Fixing build 2015-10-15 17:58:19 -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
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
Sipke Schoorstra 9605d216e6 Renamed a method and improved logging messages. 
- Renamed ImportedAll to ImportCompleted.
- Added a "batch label" to the BatchedInvoke method to be able to better identify what's being executed from the log files.
 2015-10-12 12:54:59 +02:00
Nicholas Mayne 314c7ea5b5 Merge pull request #5930 from CSurieux/dev 
upgrade the WebApi dlls in lib to version 2.2.29 fixes #5873
 2015-10-11 21:54:00 +01:00
CSurieux 330f637473 upgrade the WebApi dlls in lib to Microsoft HTTP Client Libraries 2.2.29 (package) 2015-10-11 14:31:28 +02:00
Sipke Schoorstra f8ae4cf626 Merge branch 'dev' into issue/5848/importexport 2015-10-10 12:49:56 +02:00
Sipke Schoorstra df2ab76613 Added ImportCompleted event. 
This event is invoked after all content items have been imported.
 2015-10-09 23:52:35 +02:00
Daniel Stolt f8409d5ce5 Updated the Gulp pipeline. 
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
 2015-10-09 22:41:21 +02:00
Sipke Schoorstra ee43743621 Reverted changes to content manager and content step. 2015-10-09 22:35:50 +02:00
Ryan Kelso 7e6b70e7b8 Fixes Issue #5885 
This should fix issue #5885, the DisplayAlias not having length validated. I arbitrarily set it to 1850 for the simple fact that, while the database can hold a 2048 character DisplayAlias, a URL should not be longer than ~2000 characters (per http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers ). If the DisplayAlias is 2048, it's already over the limit and that's not the entire URL for the page, this gives some buffer room for domains.
 2015-10-09 14:23:30 -04:00
Erik Scofield 7fb63fd9eb Fix incorrect project reference probably from a merge from the Naxos branch to this feature. 2015-10-09 11:08:15 -05:00