lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,140 Commits 83 Branches 32 Tags
578184f50ff2e52196a1c2d8543b38ae44e04ce1
Commit Graph

5525 Commits

Author SHA1 Message Date
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
Sipke Schoorstra
547564eda8 Merge branch 'dev' into feature/widget-elements 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 2015-10-05 10:22:26 +02:00
Daniel Stolt
9219609ce6 Updated jQuery type definitions in Orchard.Azure.MediaServices. 2015-10-04 19:34:47 +02:00
Daniel Stolt
df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Zoltán Lehóczky
5bd2066bf3 Fixing widget RenderTitle import 2015-10-04 01:41:12 +02:00
Daniel Stolt
42914c7896 Fixed a column resizing issue. 2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895 Enabled focusing (and thereby pasting into) non-sealed templated containers. 2015-10-03 19:26:13 +02:00
Sipke Schoorstra
6a90cdc681 Merge branch 'dev' into feature/widget-elements 2015-10-03 00:35:43 +02:00
Sipke Schoorstra
7a047b6d1e Removed Element stereotype. 2015-10-03 00:34:42 +02:00
Sipke Schoorstra
8535644b99 Layout editor improvements. 
- Implemented Removed element event.
- Fixed model validation in Element editor dialog.
- Extended support for placeable content.
 2015-10-03 00:28:48 +02:00
Sebastien Ros
9c88c7fcd1 Fixing draft indexation 2015-10-02 15:44:35 +02:00
jtkech
44a342c4fe Update DefaultCacheStorageProvider.cs 2015-10-02 02:15:08 +02:00
Sebastien Ros
508d97ed7d Fixing merge 2015-10-01 09:14:21 -07:00
Jamie Phillips
a01b7dde23 URL Field for Dynamic Forms 
Created this because I was binding to a content type that had a
URL
field.  Need to do this validation when submitting the dynamic form.
 2015-09-30 21:35:44 -04:00
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
 2015-09-30 15:57:34 -07:00
Sebastien Ros
62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Daniel Stolt
e0fe699049 Corrected build action of Placement.info in Orchard.Dashboards. 2015-09-30 19:12:01 +02:00
Jeff
fc759a107e Added ElementAt operator to List token. 2015-09-30 12:03:43 +01:00
Sipke Schoorstra
39a6e10c76 Implemented Removing event. 2015-09-30 01:07:43 +01:00
Sipke Schoorstra
6a7452d68b Removed unneeded property. 2015-09-29 23:42:30 +01:00
Sipke Schoorstra
994b17ebe1 Removed unused scripts. 2015-09-29 23:34:59 +01:00
Sipke Schoorstra
b40a81a469 Merge branch 'dev' into feature/widget-elements 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
 2015-09-29 21:20:50 +01:00