lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 11:17:28 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
7,661 Commits 84 Branches 32 Tags
db50a5aecbec4c4c738d4589b777a4f32c1a5a9b
Commit Graph

26 Commits

Author SHA1 Message Date
Sebastien Ros
db50a5aecb Merge branch '1.7.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
 2014-03-17 12:09:21 -07:00
Benjamin Grabkowitz
3c905bb7a2 #20542 adding "in progress" cursor to ajax directory requests 2014-03-11 15:02:04 -07:00
Benjamin Grabkowitz
b27e1d5c00 #20542 Sending initial folder structure with page rather than as an async call on load. 2014-03-11 15:02:03 -07:00
Benjamin Grabkowitz
5d2a31ffc0 #20542 Collapsible media library tree in admin. 
Dynamically loading MediaLibrary directory tree using ajax and knockout templates
 2014-03-11 15:02:02 -07:00
Lombiq
1224bdc696 Making script includes consistent by explicitly adding AtFoot() where it was implied 2014-02-20 13:40:46 +01:00
Daniel Stolt
0184cd235f Changing draft status text in media library thumbnail view. 2013-12-08 22:53:53 +01:00
Sipke Schoorstra
5888caa3d3 Media Library: adding support for displaying draft items. 2013-11-23 18:51:37 +01:00
Sebastien Ros
f7f710253f #19909: Show an error message on Media library ajax calls 
Work Item: 19909
 2013-11-07 17:43:50 -08:00
Sebastien Ros
d920b164e0 Implementing media search 2013-09-25 16:41:44 -07:00
agriffard
1edff1f34c Adding mediaItemActionUrl to mediaLibrarySettings (to distinguish with mediaItemsActionUrl) 2013-09-03 13:40:23 +02:00
Bertrand Le Roy
fb052ea341 Moving media library admin script to a separate file. 2013-08-31 20:39:00 -07:00
Sebastien Ros
2894a2d590 #19914: Fixing history state management in IE9 
Work Item: 19914
 2013-07-18 11:46:09 -07:00
Sebastien Ros
34d0de8418 Updating knockout library 
--HG--
branch : 1.x
 2013-07-15 15:42:30 -07:00
Sebastien Ros
7e8e025e63 Fixing Media Library folders edition 
--HG--
branch : 1.x
 2013-07-03 16:13:47 -07:00
Sebastien Ros
2889d29498 Refactoring the Media Library 
- Removed dependency on Orchard.Taxonomies
- Removed dependency on Orchard.Media

You will need to remove the Orchard_MediaLibrary tables and also
the Data Migration record corresponding to this module if you want to upgrade
from 1.x. You can also apply the database changes by hand, remove all the
records then use the Upgrade module to import all media.

--HG--
branch : 1.x
extra : rebase_source : 46100428d9546c3082bf65ce85d8d891543dc0a9
 2013-07-02 18:10:43 -07:00
Sebastien Ros
6e83a08ac8 Adding infinite scrolling for Recent tab 
--HG--
branch : 1.x
 2013-06-26 12:43:26 -07:00
Sebastien Ros
dc845b7b1c Fixing media popup windows 
--HG--
branch : 1.x
extra : rebase_source : 15e4f7844a8c6fb35522c86aef4d2eb79cb2fe7b
 2013-06-25 17:43:27 -07:00
Sebastien Ros
ab3c3afbdb Fixing infinite scrolling in Media Library 
--HG--
branch : 1.x
extra : rebase_source : f7b4649e080b04aa6d97ac0bf81c00bbdbb43fd2
 2013-06-21 11:54:31 -07:00
Sebastien Ros
b9d3d10bca Integrating TinyMce with the Media Library 
--HG--
branch : 1.x
extra : rebase_source : 64b75e44522bc583bfb521c8cf9850fa5d596068
 2013-06-06 16:54:12 -07:00
Sebastien Ros
91a9c8669c Improving media library browsing 
- Adding 'Recent' menu item
- Adding sorting
- Adding filtering

--HG--
branch : 1.x
 2013-05-30 18:12:17 -07:00
Sebastien Ros
cfd4f2a948 Fixing media UI glitches 
- drag and drop was contained in the list
- drag and drop anchor is now the pointer

--HG--
branch : 1.x
 2013-05-30 12:30:31 -07:00
Sebastien Ros
7868f90542 Adding oEmbed provider 
--HG--
branch : 1.x
extra : rebase_source : f59bb906662cb178ccaaeffc141227563d73f819
 2013-05-11 11:28:57 -07:00
Sebastien Ros
75767ae8fd Fixing thumbnails display 
--HG--
branch : 1.x
 2013-04-23 11:48:56 -07:00
Sebastien Ros
deb3c8d72d Fixing multi-folders selection 
--HG--
branch : 1.x
 2013-04-22 16:55:59 -07:00
Sebastien Ros
6dc3a1d35a Adding media items deletiong 
--HG--
branch : 1.x
 2013-04-22 12:15:06 -07:00
Sebastien Ros
109da3a297 Implementing Media Library module 
--HG--
branch : 1.x
 2013-04-18 10:59:15 -07:00