[gallery/gallery3] 3216c5: 3.0.10 - Alamo

----==_mimepart_553bfae2237ea_27db3f8dc1b472b85781
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit

  Branch: refs/heads/3.0.x
  Home:   https://github.com/gallery/gallery3
  Commit: 3216c522be2618138318c81ba509726132a76f38
      https://github.com/gallery/gallery3/commit/3216c522be2618138318c81ba509726132a76f38
  Author: Bharat Mediratta <[email protected]>
  Date:   2015-04-25 (Sat, 25 Apr 2015)

  Changed paths:
    M README.md
    R lib/flowplayer.controls.swf.php
    R lib/flowplayer.js
    R lib/flowplayer.pseudostreaming-byterange.swf.php
    R lib/flowplayer.pseudostreaming.swf.php
    R lib/flowplayer.swf.php
    A lib/mediaelementjs/background.png
    A lib/mediaelementjs/bigplay.png
    A lib/mediaelementjs/bigplay.svg
    A lib/mediaelementjs/controls.png
    A lib/mediaelementjs/controls.svg
    A lib/mediaelementjs/flashmediaelement.swf.php
    A lib/mediaelementjs/loading.gif
    A lib/mediaelementjs/mediaelement.js
    A lib/mediaelementjs/mediaelementplayer.css
    A lib/mediaelementjs/mediaelementplayer.js
    A lib/mediaelementjs/silverlightmediaelement.xap
    M lib/uploadify/uploadify.allglyphs.swf.php
    M lib/uploadify/uploadify.swf.php
    M modules/gallery/helpers/gallery_theme.php
    M modules/gallery/models/item.php
    M modules/gallery/tests/xss_data.txt
    M modules/gallery/views/movieplayer.html.php
    M themes/wind/css/screen.css
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  3.0.10 - Alamo

This release was generated by running the following script, then
rebasing and squashing all commits down to one change.

==

git reset --hard origin/3.0.x

git revert --no-edit    4325432f608254296e26ed63e7f9195b25bd3f20    # .swf.php stuff
git revert --no-edit    c5318bb1a2dd266b50317a2adb74d74338593733    # .swf.php stuff
git revert --no-edit    3e5bba2cd4febe8331c0158c11ea418f21c72efa    # add .php to flowplayer .swfs
git revert --no-edit    12e51694fdc39c752cc439424cf309866f9f914a    # flowplayer add .php in 3.0.x only
git cherry-pick       384bc7afc86be706bf61def09afc8306cdad2443
git cherry-pick       9d7d6c50bb7713038231232f433ae28f6f117b95
git cherry-pick     566572809679ee5a266717cee1ed922ce4161814
git cherry-pick     ce937201d0eff90178e2c89219e1000fc1175177z
git revert --no-edit    81c44c4cf333a1ec98b2226111d2792979121d40    # movie_img->filename
git cherry-pick       a517d9a33a47a2308cec1c9bfb1138abf181a909
git cherry-pick       d2577c066ba7698583c4a7fd823751876dadab6e
git cherry-pick       18f38f0dff93665267bd1497b196d9270fdbdc88
git cherry-pick     c31ab3611660273d3eb9290837334ca6f706bd64
git cherry-pick     b1dad9974116b5cd8236041bc276519d50ee0866
git cherry-pick     ce937201d0eff90178e2c89219e1000fc1175177
git cherry-pick     1ab7381f49cf656d97e2a81f757d9e3c25e36739

git cherry-pick -n 1544a83279853acccccdf179b6c96d044fee1cf6
git reset HEAD lib/j*.js modules/organize/vendor/ext/js/ext-organize-bundle.js
git checkout lib/j*.js modules/organize/vendor/ext/js/ext-organize-bundle.js
git commit --no-edit

git cherry-pick     7d9276963e99ab74143e1e2af3d83ff674bd49a3
git cherry-pick     717bab9312b7534fcc426af58bdc1a17309060f7

Revert "Use a 64-bit random space and clear the token cookie upon success."

This reverts commit 4325432f608254296e26ed63e7f9195b25bd3f20.

Revert "Strip off the fragment as well as any query parameters.  Fixes #2073."

This reverts commit c5318bb1a2dd266b50317a2adb74d74338593733.

Revert "Wrap all Flowplayer SWF files with a preamble that strips query parameters."

This reverts commit 3e5bba2cd4febe8331c0158c11ea418f21c72efa.

Revert "Update golden file for 3e5bba2cd4febe8331c0158c11ea418f21c72efa (#2070)"

This reverts commit 12e51694fdc39c752cc439424cf309866f9f914a.

- add Flowplayer 5 to lib/flowplayer-html5
- move existing Flash Flowplayer to lib/flowplayer-flash
- update page.html.php and movieplayer.html.php

--HG--
rename : lib/flowplayer.controls.swf => lib/flowplayer-flash/flowplayer.controls.swf
rename : lib/flowplayer.js => lib/flowplayer-flash/flowplayer.js
rename : lib/flowplayer.pseudostreaming-byterange.swf => lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
rename : lib/flowplayer.pseudostreaming.swf => lib/flowplayer-flash/flowplayer.pseudostreaming.swf
rename : lib/flowplayer.swf => lib/flowplayer-flash/flowplayer.swf

Follow-on to #2033 - Rename movieplayer.html.php to movieplayer-flash.html.php
- renamed file with "-flash" to make room for html5 player
- updated item model and xss_data.txt to reflect changes

--HG--
rename : modules/gallery/views/movieplayer.html.php => modules/gallery/views/movieplayer-flash.html.php

Add MediaElementJS to handle HTML5/Flash/Silverlight video and audio.

Revert "Update movie_img event to include filename (implemented as part of #2046 in master/3.1.x)."

This reverts commit 81c44c4cf333a1ec98b2226111d2792979121d40.

Follow-on to #2033 - Change variables and js script loading for Flash Flowplayer.
- changed movie_img event variable names to have "flash" in them.
- moved flowplayer.js loading from page.html.php to movieplayer-flash.
- removed conditional loading for small, photo-specific JS files in page.html.php
to keep combined JS consistent between page types (better for caching).

Follow-on to 384bc7afc86be706bf61def09afc8306cdad2443 for #2033
Update golden file for XSS test.

Follow-on to ce937201d0eff90178e2c89219e1000fc1175177, update the swf file
to 2.12.0 in sync with vendor.

Replace flashmediaelement.swf with a PHP wrapper that strips url
fragments and query parameters.

Updated MediaElement.js to 2.12.0 (2601db5ebeeaa96b3fa1f1015c494433cbcd9a85)

Update to newest MediaElementJS (follows vendor repo).

Minify (and re-minify) JS libraries (in sync with gallery3-vendor).
- minified jQuery libraries.
- re-minified flowplayer, json2-min, and extjs using new minimizer (more efficient, keeps copyrights).

Conflicts:
	lib/jquery-ui.js
	lib/jquery.cookie.js
	lib/jquery.form.js
	lib/jquery.js
	lib/jquery.localscroll.js
	lib/jquery.scrollTo.js
	lib/json2-min.js

Remove Flash Flowplayer v3.

Remove HTML5 Flowplayer v5.



----==_mimepart_553bfae2237ea_27db3f8dc1b472b85781
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
----==_mimepart_553bfae2237ea_27db3f8dc1b472b85781
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
----==_mimepart_553bfae2237ea_27db3f8dc1b472b85781--