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,504 Commits 94 Branches 33 Tags
c788dd61a252f6b69cdc1aa1fc0be49f5ceea285
Commit Graph

5746 Commits

Author SHA1 Message Date
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
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
 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
Ryan Kelso
74a5c8d2aa Fixes error message wording problem 2015-10-14 13:47:01 -04: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
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
dcinzona
855d183be3 Fixes #5935 Updates Azure.Storage to 5.0.2.0 2015-10-13 15:38:57 -04: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
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
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
Matthew Harris
e853550bda fix multitenancy ui glitch 2015-10-09 10:45:17 +01:00
Matthew Harris
24c68bebe4 fix triple columns not fitting on small screens 2015-10-08 21:33:18 +01:00
Matthew Harris
0a82363187 fix css issue 2015-10-08 21:26:37 +01:00
Sébastien Ros
1e87eee2e4 Merge pull request #5852 from Codinlab/issue/5737 
[Fixes #5737] ChangeListView throws NRE on unpublished Lists
 2015-10-08 12:27:02 -07:00
Sébastien Ros
53244d702c Merge pull request #5851 from mjy78/issue/5125 
[Fixes #5125] Ensure the modified taxonomy items are not lost if a model validation…
 2015-10-08 12:26:25 -07:00
Sébastien Ros
e3ca35548c Merge pull request #5850 from armanforghani/issue/4951 
[Fixes 4951] Adding ManageTemplates permission.
 2015-10-08 12:25:45 -07:00
Sébastien Ros
07cc3a6bad Merge pull request #5804 from mvarblow/patch-2 
Prevent no-op tasks for taxonomy field updates.
 2015-10-08 12:19:11 -07:00
Sébastien Ros
5fc3170f1c Merge pull request #5796 from OrchardCMS/issue/5791/homealias 
[Fixes #5791] Home Alias fixes for issue
 2015-10-08 12:15:54 -07:00
Sébastien Ros
6f4762a30c Merge pull request #5785 from mjy78/issue/21244 
[Fixes #5073] Display warning when insecure custom forms are created
 2015-10-08 12:12:53 -07:00
Sébastien Ros
ce3179307d Merge pull request #5784 from mjy78/issue/20514 
[Fixes #4343] Remove id from custom form returnUrl hidden field
 2015-10-08 12:11:06 -07:00
Sébastien Ros
f4136b9ed8 Merge pull request #5691 from RoyalVeterinaryCollege/3402 
#3402: Implemented List tokens.
 2015-10-08 12:06:21 -07:00
Erik Scofield
2620dc820d ~Fix resource include 
~Rename javascript resource from RecentContentTab to SelectableContentTab for use in Search content picker as well.
+Add Selectable to Search Content Picker
+Add Select All to Search Content Picker
 2015-10-06 23:27:30 -05:00
Piotr Szmyd
b04a22fa4b Merge pull request #5887 from jtkech/patch-2 
Fixes #5879: Layout part OnIndexing fails when called in a background task
 2015-10-05 15:36:42 +02:00
Sipke Schoorstra
d09406c4ca Merge branch 'dev' into feature/widget-elements 2015-10-05 15:36:17 +02:00
Nicholas Mayne
e6c7851cca Merge pull request #5897 from paynecrl97/patch-1 
Fixes 1+n db call issue
 2015-10-05 12:35:43 +02:00