[gallery/gallery3] 384bc7: #2033 - Add Flowplayer 5 to play HTML5 videos.

  Branch: refs/heads/kohana_3
  Home:   https://github.com/gallery/gallery3
  Commit: 384bc7afc86be706bf61def09afc8306cdad2443
      https://github.com/gallery/gallery3/commit/384bc7afc86be706bf61def09afc8306cdad2443
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    A lib/flowplayer-flash/flowplayer.controls.swf
    A lib/flowplayer-flash/flowplayer.js
    A lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
    A lib/flowplayer-flash/flowplayer.pseudostreaming.swf
    A lib/flowplayer-flash/flowplayer.swf
    A lib/flowplayer-html5/flowplayer.js
    A lib/flowplayer-html5/flowplayer.swf
    A lib/flowplayer-html5/skin/all-skins.css
    A lib/flowplayer-html5/skin/functional.css
    A lib/flowplayer-html5/skin/img/black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/minimalist.css
    A lib/flowplayer-html5/skin/playful.css
    R lib/flowplayer.controls.swf
    R lib/flowplayer.js
    R lib/flowplayer.pseudostreaming-byterange.swf
    R lib/flowplayer.pseudostreaming.swf
    R lib/flowplayer.swf
    M modules/gallery/views/movieplayer.html.php
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  #2033 - Add Flowplayer 5 to play HTML5 videos.
- 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


  Commit: e7b224461a4137666f97eb23c063bbb2bf5fdc7a
      https://github.com/gallery/gallery3/commit/e7b224461a4137666f97eb23c063bbb2bf5fdc7a
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M modules/gallery/helpers/legal_file.php
    M modules/gallery/tests/Legal_File_Helper_Test.php

  Log Message:
  -----------
  #2034 - Add webm and ogv as valid movie types.
- added them to legal_file helper
- revised unit tests


  Commit: 9d7d6c50bb7713038231232f433ae28f6f117b95
      https://github.com/gallery/gallery3/commit/9d7d6c50bb7713038231232f433ae28f6f117b95
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M modules/gallery/models/item.php
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/movieplayer-flash.html.php
    R modules/gallery/views/movieplayer.html.php

  Log Message:
  -----------
  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


  Commit: 8d05571fa3314dc1b7c3abc4e8e20d8bd4886109
      https://github.com/gallery/gallery3/commit/8d05571fa3314dc1b7c3abc4e8e20d8bd4886109
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-03 (Sun, 03 Mar 2013)

  Changed paths:
    A lib/flowplayer-flash/flowplayer.controls.swf
    A lib/flowplayer-flash/flowplayer.js
    A lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
    A lib/flowplayer-flash/flowplayer.pseudostreaming.swf
    A lib/flowplayer-flash/flowplayer.swf
    A lib/flowplayer-html5/flowplayer.js
    A lib/flowplayer-html5/flowplayer.swf
    A lib/flowplayer-html5/skin/all-skins.css
    A lib/flowplayer-html5/skin/functional.css
    A lib/flowplayer-html5/skin/img/black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/minimalist.css
    A lib/flowplayer-html5/skin/playful.css
    R lib/flowplayer.controls.swf
    R lib/flowplayer.js
    R lib/flowplayer.pseudostreaming-byterange.swf
    R lib/flowplayer.pseudostreaming.swf
    R lib/flowplayer.swf
    M modules/gallery/models/item.php
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/movieplayer-flash.html.php
    R modules/gallery/views/movieplayer.html.php
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  Merge pull request #178 from shadlaws/fix_2033

#2033 - Add Flowplayer 5 to play HTML5 videos.


  Commit: e77276736351700b3bbd1080369738620ff8be28
      https://github.com/gallery/gallery3/commit/e77276736351700b3bbd1080369738620ff8be28
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-03 (Sun, 03 Mar 2013)

  Changed paths:
    M modules/gallery/helpers/legal_file.php
    M modules/gallery/tests/Legal_File_Helper_Test.php

  Log Message:
  -----------
  Merge pull request #179 from shadlaws/fix_2034

#2034 - Add webm and ogv as valid movie types.


  Commit: 295fadd5704d8e381aef988915ea3e8ea8fd43f6
      https://github.com/gallery/gallery3/commit/295fadd5704d8e381aef988915ea3e8ea8fd43f6
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-03 (Sun, 03 Mar 2013)

  Changed paths:
    M modules/gallery/models/item.php

  Log Message:
  -----------
  #2037 - Fix bug with "item_before_update" event in item model.


  Commit: 1544a83279853acccccdf179b6c96d044fee1cf6
      https://github.com/gallery/gallery3/commit/1544a83279853acccccdf179b6c96d044fee1cf6
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M lib/flowplayer-flash/flowplayer.js
    M lib/jquery-ui.js
    M lib/jquery.cookie.js
    M lib/jquery.form.js
    M lib/jquery.js
    M lib/jquery.localscroll.js
    M lib/jquery.scrollTo.js
    M lib/json2-min.js
    M modules/organize/vendor/ext/js/ext-organize-bundle.js

  Log Message:
  -----------
  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).


  Commit: 4fe07c6b0a341b0b99ee1b051f7c0bdfda572e04
      https://github.com/gallery/gallery3/commit/4fe07c6b0a341b0b99ee1b051f7c0bdfda572e04
  Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M modules/gallery_unit_test/controllers/gallery_unit_test.php
    M modules/unit_test/libraries/Unit_Test.php

  Log Message:
  -----------
  Return "1" to CLI if not all unit tests pass.


  Commit: d5f3dfafda51a306ebe327b868931af1b0bbdb2a
      https://github.com/gallery/gallery3/commit/d5f3dfafda51a306ebe327b868931af1b0bbdb2a
  Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    A .travis.yml

  Log Message:
  -----------
  Travis CI integration.


  Commit: a517d9a33a47a2308cec1c9bfb1138abf181a909
      https://github.com/gallery/gallery3/commit/a517d9a33a47a2308cec1c9bfb1138abf181a909
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M modules/gallery/models/item.php
    M modules/gallery/views/movieplayer-flash.html.php
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  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).


  Commit: 20614e29c08ccdf704c93c83bb623dc55f2ef59e
      https://github.com/gallery/gallery3/commit/20614e29c08ccdf704c93c83bb623dc55f2ef59e
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    A .travis.yml
    M modules/gallery_unit_test/controllers/gallery_unit_test.php
    M modules/unit_test/libraries/Unit_Test.php

  Log Message:
  -----------
  Merge pull request #186 from jozefs/travis

Integrate with Travis CI


  Commit: f1884b59f13a704e53975a8104df83b9b8891f24
      https://github.com/gallery/gallery3/commit/f1884b59f13a704e53975a8104df83b9b8891f24
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M modules/gallery/models/item.php

  Log Message:
  -----------
  Merge pull request #183 from shadlaws/fix_2037

#2037 - Fix bug with "item_before_update" event in item model.


  Commit: 0fb8e202c9b41973d96a89f7ecea3007722fa022
      https://github.com/gallery/gallery3/commit/0fb8e202c9b41973d96a89f7ecea3007722fa022
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M lib/flowplayer-flash/flowplayer.js
    M lib/jquery-ui.js
    M lib/jquery.cookie.js
    M lib/jquery.form.js
    M lib/jquery.js
    M lib/jquery.localscroll.js
    M lib/jquery.scrollTo.js
    M lib/json2-min.js
    M modules/organize/vendor/ext/js/ext-organize-bundle.js

  Log Message:
  -----------
  Merge pull request #185 from shadlaws/minifyjs_20130304

Minify (and re-minify) JS libraries (in sync with gallery3-vendor).


  Commit: 24475e914ffb5f639f35b500e29b2743cf2216c7
      https://github.com/gallery/gallery3/commit/24475e914ffb5f639f35b500e29b2743cf2216c7
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M modules/gallery/models/item.php
    M modules/gallery/views/movieplayer-flash.html.php
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  Merge pull request #187 from shadlaws/2033_followon

Follow-on to #2033 - Change variables and js script loading for Flash Fl...


  Commit: d449eabe7f0638454d340640aa143e4be71818ac
      https://github.com/gallery/gallery3/commit/d449eabe7f0638454d340640aa143e4be71818ac
  Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    R README
    A README.md

  Log Message:
  -----------
  Convert README to Markdown.


  Commit: ef1ae582bb1997cc91d9936d81e4821b74abe3b1
      https://github.com/gallery/gallery3/commit/ef1ae582bb1997cc91d9936d81e4821b74abe3b1
  Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Add Travis CI build status badge to README.


  Commit: 4b28478776071bf764545de767b70939484519aa
      https://github.com/gallery/gallery3/commit/4b28478776071bf764545de767b70939484519aa
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M modules/gallery/controllers/admin_maintenance.php
    M modules/gallery/helpers/module.php

  Log Message:
  -----------
  #2040 - Deactivate modules that no longer exist.
- added module::deactivate_missing_modules()
- revised module::deactivate() to change log message if the module is missing
- added call to new function in module::get_obsolete_modules_message()
- added call to new function when loading admin/maintenance menu


  Commit: e630ab9bdc45cbb9ebd7db8fd280cb898fe6f291
      https://github.com/gallery/gallery3/commit/e630ab9bdc45cbb9ebd7db8fd280cb898fe6f291
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    R README
    A README.md

  Log Message:
  -----------
  Merge pull request #189 from jozefs/markdown

Convert README to Markdown and show build status badge


  Commit: 7fd7b10108b8edca232d6eb387669189383b52ea
      https://github.com/gallery/gallery3/commit/7fd7b10108b8edca232d6eb387669189383b52ea
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M modules/gallery/controllers/admin_maintenance.php
    M modules/gallery/helpers/module.php

  Log Message:
  -----------
  Merge pull request #190 from shadlaws/fix_2040

#2040 - Deactivate modules that no longer exist.


  Commit: 74532b9c948c471115239fa1a0b54c10ccdbeb9c
      https://github.com/gallery/gallery3/commit/74532b9c948c471115239fa1a0b54c10ccdbeb9c
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M modules/gallery/controllers/file_proxy.php

  Log Message:
  -----------
  Remove stray line of debug output.


  Commit: d2577c066ba7698583c4a7fd823751876dadab6e
      https://github.com/gallery/gallery3/commit/d2577c066ba7698583c4a7fd823751876dadab6e
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M modules/gallery/tests/xss_data.txt

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


  Commit: 1830839b75fcb852b9aff9141f659c027e09061f
      https://github.com/gallery/gallery3/commit/1830839b75fcb852b9aff9141f659c027e09061f
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Test against 5.2.3, our minimum version.
Also test against 5.3, 5.4 and 5.5 to be forward looking


  Commit: b8e0bbafc40cf7505c8ca8f6939977ea3e1d3510
      https://github.com/gallery/gallery3/commit/b8e0bbafc40cf7505c8ca8f6939977ea3e1d3510
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Travis doesn't have PHP 5.2.3.  Test against 5.3 / 5.4 / 5.5.


  Commit: dc7bf9486f9eaa3f8633c51c786434cec1605834
      https://github.com/gallery/gallery3/commit/dc7bf9486f9eaa3f8633c51c786434cec1605834
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M modules/gallery/tests/Item_Model_Test.php

  Log Message:
  -----------
  Follow-on for #2043.  Fix some tests that made bad assumptions about
the state of the world.  These were uncovered when we ran the tests on
Travis which runs the tests in a different order than what I (and
apparently others) use on their dev boxes.


  Commit: 121fee8c4e8ee88017df017eaf0638cde2dd8ec5
      https://github.com/gallery/gallery3/commit/121fee8c4e8ee88017df017eaf0638cde2dd8ec5
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 376 for branch master
Last update: 0d05e91cd3c5050c25133c864f8b789f499d8e17 (16 commits ago)


  Commit: d136a035e38e920f294aa71acce23a28fc6f5796
      https://github.com/gallery/gallery3/commit/d136a035e38e920f294aa71acce23a28fc6f5796
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M modules/gallery_unit_test/controllers/gallery_unit_test.php

  Log Message:
  -----------
  Explicitly print out the exit status to see if I can narrow down failures on Travis.


  Commit: 1752929a7a96cf11581bf8fc6ef4f7515ba91fda
      https://github.com/gallery/gallery3/commit/1752929a7a96cf11581bf8fc6ef4f7515ba91fda
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 377 for branch master
Last update: 121fee8c4e8ee88017df017eaf0638cde2dd8ec5 (1 commits ago)
[ci skip]


  Commit: feed100337e2222c4656901d11c2f80a0e667002
      https://github.com/gallery/gallery3/commit/feed100337e2222c4656901d11c2f80a0e667002
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M modules/gallery_unit_test/controllers/gallery_unit_test.php
    M modules/unit_test/libraries/Unit_Test.php

  Log Message:
  -----------
  Revert "Return "1" to CLI if not all unit tests pass.".  We're not successfully
passing back $all_passed because the function doesn't take it by reference.  Which
is my fault because I gave Jozefs bad advice.  But I don't think it's necessary anyway
so I'm going to try a different approach.

This reverts commit 4fe07c6b0a341b0b99ee1b051f7c0bdfda572e04.

Conflicts:
	modules/gallery_unit_test/controllers/gallery_unit_test.php


  Commit: f0064643c20d66a4b4abb3b6450afe6c48e27da1
      https://github.com/gallery/gallery3/commit/f0064643c20d66a4b4abb3b6450afe6c48e27da1
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M modules/gallery_unit_test/controllers/gallery_unit_test.php

  Log Message:
  -----------
  Set exit status to the number of failed tests.  This should fix issues with Travis.


  Commit: 1c27c6a706a116faf59e352a118c8e6894f6ab1e
      https://github.com/gallery/gallery3/commit/1c27c6a706a116faf59e352a118c8e6894f6ab1e
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Merge branch 'master' of github.com:gallery/gallery3


  Commit: 97a156d530b22d190f2c227105fd279a049ac76d
      https://github.com/gallery/gallery3/commit/97a156d530b22d190f2c227105fd279a049ac76d
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 378 for branch master
Last update: 121fee8c4e8ee88017df017eaf0638cde2dd8ec5 (4 commits ago)
[ci skip]


  Commit: 59ea4a6a312d2891bb51bd2670635637924f7dcf
      https://github.com/gallery/gallery3/commit/59ea4a6a312d2891bb51bd2670635637924f7dcf
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M modules/gallery_unit_test/controllers/gallery_unit_test.php

  Log Message:
  -----------
  Follow-on fix: count errors as well as test failures.


  Commit: f9939e282bc79ef6e7ac3c81c80897c3d76270b9
      https://github.com/gallery/gallery3/commit/f9939e282bc79ef6e7ac3c81c80897c3d76270b9
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 379 for branch master
Last update: 97a156d530b22d190f2c227105fd279a049ac76d (1 commits ago)
[ci skip]


  Commit: 9e9c32b6d6f17f4dda10ceffe34d5fc9f4d4ff91
      https://github.com/gallery/gallery3/commit/9e9c32b6d6f17f4dda10ceffe34d5fc9f4d4ff91
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Only build 3.0.x, 3.1.x and master branches


  Commit: f50590127f960a59a25e4daff16d0c98d062b712
      https://github.com/gallery/gallery3/commit/f50590127f960a59a25e4daff16d0c98d062b712
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 380 for branch master
Last update: f9939e282bc79ef6e7ac3c81c80897c3d76270b9 (1 commits ago)
[ci skip]


  Commit: e8552f4e61cadf98f5f303a3be621f960f2afdf4
      https://github.com/gallery/gallery3/commit/e8552f4e61cadf98f5f303a3be621f960f2afdf4
  Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Add newline after code block so packaging doesn't complain.


  Commit: ab5be078d29a82a8d8ca840436dd8537e58cb062
      https://github.com/gallery/gallery3/commit/ab5be078d29a82a8d8ca840436dd8537e58cb062
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Merge pull request #192 from jozefs/master

Fix README.md so new packaging code doesn't bomb out


  Commit: d7ceab5608134c7eadf6ffe2375a501d0e488508
      https://github.com/gallery/gallery3/commit/d7ceab5608134c7eadf6ffe2375a501d0e488508
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 381 for branch master
Last update: f50590127f960a59a25e4daff16d0c98d062b712 (1 commits ago)
[ci skip]


  Commit: ef471b5b6cdfc35cd504195d9d5602c9e3fbcc07
      https://github.com/gallery/gallery3/commit/ef471b5b6cdfc35cd504195d9d5602c9e3fbcc07
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M .build_number
    A .travis.yml
    R README
    A README.md
    A lib/flowplayer-flash/flowplayer.controls.swf
    A lib/flowplayer-flash/flowplayer.js
    A lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
    A lib/flowplayer-flash/flowplayer.pseudostreaming.swf
    A lib/flowplayer-flash/flowplayer.swf
    A lib/flowplayer-html5/flowplayer.js
    A lib/flowplayer-html5/flowplayer.swf
    A lib/flowplayer-html5/skin/all-skins.css
    A lib/flowplayer-html5/skin/functional.css
    A lib/flowplayer-html5/skin/img/black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/play_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_black.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/playful_white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/img/white.png
    A lib/flowplayer-html5/skin/img/[email protected]
    A lib/flowplayer-html5/skin/minimalist.css
    A lib/flowplayer-html5/skin/playful.css
    R lib/flowplayer.controls.swf
    R lib/flowplayer.js
    R lib/flowplayer.pseudostreaming-byterange.swf
    R lib/flowplayer.pseudostreaming.swf
    R lib/flowplayer.swf
    M lib/jquery-ui.js
    M lib/jquery.cookie.js
    M lib/jquery.form.js
    M lib/jquery.js
    M lib/jquery.localscroll.js
    M lib/jquery.scrollTo.js
    M lib/json2-min.js
    M modules/gallery/controllers/admin_maintenance.php
    M modules/gallery/controllers/file_proxy.php
    M modules/gallery/helpers/legal_file.php
    M modules/gallery/helpers/module.php
    M modules/gallery/models/item.php
    M modules/gallery/tests/Item_Model_Test.php
    M modules/gallery/tests/Legal_File_Helper_Test.php
    M modules/gallery/tests/xss_data.txt
    A modules/gallery/views/movieplayer-flash.html.php
    R modules/gallery/views/movieplayer.html.php
    M modules/gallery_unit_test/controllers/gallery_unit_test.php
    M modules/organize/vendor/ext/js/ext-organize-bundle.js
    M themes/wind/views/page.html.php

  Log Message:
  -----------
  Merge branch 'master' into kohana_3


Compare: https://github.com/gallery/gallery3/compare/5001f58a40b9...ef471b5b6cdf

------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester  
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the  
endpoint security space. For insight on selecting the right partner to 
tackle endpoint security challenges, access the full report. 
http://p.sf.net/sfu/symantec-dev2dev

__[ 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 ]