Revision fa91cf8489421b59140efb9f74e7b508e45c5bad
Committed on 22/05/2013 3:31 am by
Raymond Julin <[email protected]> [GitHub Diff]
Merge branch 'exceed2'
* exceed2: (119 commits)
Added forgotten jcrop css
Change namespace for compiled templates to ensure no conflict
Editing works in backoffice again
Upgrade grunt + plupload
Fixes #111, scaler falsly claimed media was too small for some crops
Update jquery.jcrop.min
Exceed 2.0 compliance fixes; jquery 1.9 + backbone 1.0
Adhere to plupload 2.0 as exceed design now uses
Inform user when search yields no results, and fix show more placement in firefox
Safeguard against js errors in Browser#search
Correctly highlight INI-examples in readme
Use brightcove js from local source to avoid http(s) problems. Fixes #97
Made it possible to change cropping on images in tinyMCE editor.
Fixes #98, dont crash when closing stack while scaler view is open
Dont ever load brightcove over https, it breaks. Fixes #97
Reset aspect ratio in scaler when changing version
Fixes #96, show a loader when loading more medias
Fixes #621, show a loader when searching keymedia backend
Show info image on scale button correct
Export file.url on media objects so movie originals can be downloaded
...
Conflicts:
design/ezexceed/javascript/keymedia/views/scaler.js
