[gallery/gallery3] cd83b0: Update README.md to say 3.1+ instead of 3.0+.
GitHub <noreply-9UaJU3cA/F/[email protected]>
| Newsgroups | gmane.comp.web.gallery.cvs |
|---|---|
| Message-ID | <513e0b0383ea5_184613c013074090@hookshot-fe5-pe1-prd.aws.github.net.mail> |
Branch: refs/heads/kohana_3
Home: https://github.com/gallery/gallery3
Commit: cd83b06ab053bde422d59a10081092e160800cf7
https://github.com/gallery/gallery3/commit/cd83b06ab053bde422d59a10081092e160800cf7
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M README.md
Log Message:
-----------
Update README.md to say 3.1+ instead of 3.0+.
Commit: 8b3897915c0d864c69c39c775d5f5bd7430fb1ec
https://github.com/gallery/gallery3/commit/8b3897915c0d864c69c39c775d5f5bd7430fb1ec
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M modules/organize/vendor/ext/css/ext-all.css
M modules/organize/vendor/ext/css/ux-all.css
M modules/organize/vendor/ext/images/default/panel/tool-sprites.gif
M modules/organize/vendor/ext/js/ext-organize-bundle.js
Log Message:
-----------
#2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor).
Commit: a2c615c0e98f8966e631116a7085aaa78eb4efaa
https://github.com/gallery/gallery3/commit/a2c615c0e98f8966e631116a7085aaa78eb4efaa
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M README.md
Log Message:
-----------
Merge pull request #193 from shadlaws/readme_31_update
Update README.md to say 3.1+ instead of 3.0+.
Commit: 8dc54495411b5c7c728efccece81b3c41dd2b201
https://github.com/gallery/gallery3/commit/8dc54495411b5c7c728efccece81b3c41dd2b201
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 382 for branch master
Last update: d7ceab5608134c7eadf6ffe2375a501d0e488508 (1 commits ago)
[ci skip]
Commit: 8b47bad74b885a5b4cf9b1f10f73b029b7d3bc37
https://github.com/gallery/gallery3/commit/8b47bad74b885a5b4cf9b1f10f73b029b7d3bc37
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M modules/organize/vendor/ext/css/ext-all.css
M modules/organize/vendor/ext/css/ux-all.css
M modules/organize/vendor/ext/images/default/panel/tool-sprites.gif
M modules/organize/vendor/ext/js/ext-organize-bundle.js
Log Message:
-----------
Merge pull request #194 from shadlaws/fix_2015_extjs_340
#2015 - Update ExtJS to 3.4.0 (in sync with gallery3-vendor).
Commit: f5475535a2b4107709caeec6f74ce76465dbb632
https://github.com/gallery/gallery3/commit/f5475535a2b4107709caeec6f74ce76465dbb632
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 383 for branch master
Last update: 8dc54495411b5c7c728efccece81b3c41dd2b201 (1 commits ago)
[ci skip]
Commit: 5d1033454c7146fb8a332dedd7be9198d0b34355
https://github.com/gallery/gallery3/commit/5d1033454c7146fb8a332dedd7be9198d0b34355
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-08 (Fri, 08 Mar 2013)
Changed paths:
M modules/gallery/views/admin_movies.html.php
Log Message:
-----------
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
Commit: 717bab9312b7534fcc426af58bdc1a17309060f7
https://github.com/gallery/gallery3/commit/717bab9312b7534fcc426af58bdc1a17309060f7
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-08 (Fri, 08 Mar 2013)
Changed paths:
R lib/flowplayer-html5/flowplayer.js
R lib/flowplayer-html5/flowplayer.swf
R lib/flowplayer-html5/skin/all-skins.css
R lib/flowplayer-html5/skin/functional.css
R lib/flowplayer-html5/skin/img/black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/minimalist.css
R lib/flowplayer-html5/skin/playful.css
Log Message:
-----------
Remove HTML5 Flowplayer v5.
Commit: 566572809679ee5a266717cee1ed922ce4161814
https://github.com/gallery/gallery3/commit/566572809679ee5a266717cee1ed922ce4161814
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-08 (Fri, 08 Mar 2013)
Changed paths:
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
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
Log Message:
-----------
Add MediaElementJS to handle HTML5/Flash/Silverlight video and audio.
Commit: 7bb24c3160c79ff52fdf2b9559387810172e4f3e
https://github.com/gallery/gallery3/commit/7bb24c3160c79ff52fdf2b9559387810172e4f3e
Author: Jozef Selesi <jozef.selesi-m0zKTrUfq7f2eFz/[email protected]>
Date: 2013-03-08 (Fri, 08 Mar 2013)
Changed paths:
M .gitignore
Log Message:
-----------
Add Vagrant files to .gitignore.
Trac-Ticket: #2047
Commit: 18f38f0dff93665267bd1497b196d9270fdbdc88
https://github.com/gallery/gallery3/commit/18f38f0dff93665267bd1497b196d9270fdbdc88
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M modules/gallery/helpers/gallery_theme.php
M modules/gallery/models/item.php
M modules/gallery/tests/xss_data.txt
R modules/gallery/views/movieplayer-flash.html.php
A modules/gallery/views/movieplayer.html.php
M themes/wind/css/screen.css
Log Message:
-----------
#2046 - Change Gallery over to using MediaElementJS as its movie player.
Commit: 7d9276963e99ab74143e1e2af3d83ff674bd49a3
https://github.com/gallery/gallery3/commit/7d9276963e99ab74143e1e2af3d83ff674bd49a3
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
R lib/flowplayer-flash/flowplayer.controls.swf
R lib/flowplayer-flash/flowplayer.js
R lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
R lib/flowplayer-flash/flowplayer.pseudostreaming.swf
R lib/flowplayer-flash/flowplayer.swf
Log Message:
-----------
Remove Flash Flowplayer v3.
Commit: de3f9edb88aaf0486485838de1b115f2d9ac87c9
https://github.com/gallery/gallery3/commit/de3f9edb88aaf0486485838de1b115f2d9ac87c9
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M modules/gallery/helpers/movie.php
M modules/gallery/helpers/system.php
Log Message:
-----------
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/".
- movie::find_ffmpeg - made it use is_executable instead of just file_exists.
- system::find_binary - removed possible doubled "/" in paths.
Commit: 451ec32555586e484030eac2051f1314806505fe
https://github.com/gallery/gallery3/commit/451ec32555586e484030eac2051f1314806505fe
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M modules/gallery/helpers/movie.php
M modules/gallery/helpers/system.php
Log Message:
-----------
Merge pull request #198 from shadlaws/followon_1935
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/"
Commit: 43f2c4ecaace42731e794203b6827a0cefc7b450
https://github.com/gallery/gallery3/commit/43f2c4ecaace42731e794203b6827a0cefc7b450
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 384 for branch master
Last update: f5475535a2b4107709caeec6f74ce76465dbb632 (1 commits ago)
[ci skip]
Commit: a01ec9ff5ff2e73c0b1de3a4a01d1f3e97c58fc7
https://github.com/gallery/gallery3/commit/a01ec9ff5ff2e73c0b1de3a4a01d1f3e97c58fc7
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M modules/gallery/views/admin_movies.html.php
Log Message:
-----------
Merge pull request #197 from shadlaws/followon_2003
Follow-on to #2003 - Fix innocuous typo (unneeded semi-colon).
Commit: 2b8fdd3b9031f130347107de90ebb3d8da0aa7c8
https://github.com/gallery/gallery3/commit/2b8fdd3b9031f130347107de90ebb3d8da0aa7c8
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 385 for branch master
Last update: 43f2c4ecaace42731e794203b6827a0cefc7b450 (1 commits ago)
[ci skip]
Commit: 2c2f61467a2b40bed6dfb6bcc679fde898b47b0e
https://github.com/gallery/gallery3/commit/2c2f61467a2b40bed6dfb6bcc679fde898b47b0e
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M .gitignore
Log Message:
-----------
Merge pull request #195 from jozefs/master
Add Vagrant-related files to .gitignore
Commit: e2cc29a61a0cb2c60e015841af983d3a6572a9d9
https://github.com/gallery/gallery3/commit/e2cc29a61a0cb2c60e015841af983d3a6572a9d9
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 386 for branch master
Last update: 2b8fdd3b9031f130347107de90ebb3d8da0aa7c8 (1 commits ago)
[ci skip]
Commit: 0899528ff5e0057c9bd6436a9e79dc6bac9726d6
https://github.com/gallery/gallery3/commit/0899528ff5e0057c9bd6436a9e79dc6bac9726d6
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
R lib/flowplayer-flash/flowplayer.controls.swf
R lib/flowplayer-flash/flowplayer.js
R lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
R lib/flowplayer-flash/flowplayer.pseudostreaming.swf
R lib/flowplayer-flash/flowplayer.swf
R lib/flowplayer-html5/flowplayer.js
R lib/flowplayer-html5/flowplayer.swf
R lib/flowplayer-html5/skin/all-skins.css
R lib/flowplayer-html5/skin/functional.css
R lib/flowplayer-html5/skin/img/black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/minimalist.css
R lib/flowplayer-html5/skin/playful.css
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
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 modules/gallery/helpers/gallery_theme.php
M modules/gallery/models/item.php
M modules/gallery/tests/xss_data.txt
R modules/gallery/views/movieplayer-flash.html.php
A modules/gallery/views/movieplayer.html.php
M themes/wind/css/screen.css
Log Message:
-----------
Merge pull request #196 from shadlaws/fix_2046
#2046 - Change Gallery over to using MediaElementJS as its movie player
Commit: 4d631a4cad515984fd202fbaa124b6a01f156379
https://github.com/gallery/gallery3/commit/4d631a4cad515984fd202fbaa124b6a01f156379
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-09 (Sat, 09 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 387 for branch master
Last update: e2cc29a61a0cb2c60e015841af983d3a6572a9d9 (1 commits ago)
[ci skip]
Commit: b036b8acc0835126e76814abdd76da4d80d4b0fc
https://github.com/gallery/gallery3/commit/b036b8acc0835126e76814abdd76da4d80d4b0fc
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-10 (Sun, 10 Mar 2013)
Changed paths:
M modules/gallery_unit_test/controllers/gallery_unit_test.php
Log Message:
-----------
Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable.
Commit: b43349f4de3612da1757a9293d205e081640e106
https://github.com/gallery/gallery3/commit/b43349f4de3612da1757a9293d205e081640e106
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-10 (Sun, 10 Mar 2013)
Changed paths:
M modules/g2_import/views/admin_g2_import.html.php
M modules/gallery/tests/xss_data.txt
M modules/server_add/views/admin_server_add.html.php
M modules/tag/helpers/tag_theme.php
Log Message:
-----------
#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
- removed autocomplete.css/js calls in server_add, tag, and g2_import.
- revised xss_data.txt golden file (line number changes only).
Commit: 67504a00ebf918274d23f316e076112166989938
https://github.com/gallery/gallery3/commit/67504a00ebf918274d23f316e076112166989938
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M lib/gallery.show_full_size.js
Log Message:
-----------
#2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor.
- fixed for new jQuery.
- removed unnecessary CSS.
- fixed bug where small images would get oversized when the window was resized.
- refactored a few other things.
Commit: 2e94edab5396d53b1b09b6b1415d1f66d6f16de5
https://github.com/gallery/gallery3/commit/2e94edab5396d53b1b09b6b1415d1f66d6f16de5
Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M lib/gallery.common.js
M modules/server_add/js/server_add.js
M themes/wind/js/ui.init.js
M themes/wind/views/photo.html.php
Log Message:
-----------
#2053 - Change all .bind() to .on() for jQuery future-proofing.
- on/off are preferred to bind/unbind, live/die, and delegate/undelegate in jQuery 1.7+
- they're likely on the road toward deprecation, so let's replace them now.
Commit: 1a9f87d3eefe1fe2d327d7e1ac7628c78314d2eb
https://github.com/gallery/gallery3/commit/1a9f87d3eefe1fe2d327d7e1ac7628c78314d2eb
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M modules/gallery_unit_test/controllers/gallery_unit_test.php
Log Message:
-----------
Merge pull request #199 from shadlaws/unit_test_fix_20130310
Follow-on fix: if tests throw an exception, don't throw another by calling an undefined variable.
Commit: 2478bb06fde719598e090908a8f08396adb81517
https://github.com/gallery/gallery3/commit/2478bb06fde719598e090908a8f08396adb81517
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 388 for branch master
Last update: 4d631a4cad515984fd202fbaa124b6a01f156379 (1 commits ago)
[ci skip]
Commit: 12508a71e037fe478fc1c9a1c188f2e996dd1fc4
https://github.com/gallery/gallery3/commit/12508a71e037fe478fc1c9a1c188f2e996dd1fc4
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M modules/g2_import/views/admin_g2_import.html.php
M modules/gallery/tests/xss_data.txt
M modules/server_add/views/admin_server_add.html.php
M modules/tag/helpers/tag_theme.php
Log Message:
-----------
Merge pull request #200 from shadlaws/fix_2048
#2048 - Remove unneeded jquery.autocomplete.css/js inclusions.
Commit: 5c137b655ba525da08e0a5d8eeeb5e9224651aaf
https://github.com/gallery/gallery3/commit/5c137b655ba525da08e0a5d8eeeb5e9224651aaf
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 389 for branch master
Last update: 2478bb06fde719598e090908a8f08396adb81517 (1 commits ago)
[ci skip]
Commit: 1ed4ef1fb1bae8531983f108a8007df19316c089
https://github.com/gallery/gallery3/commit/1ed4ef1fb1bae8531983f108a8007df19316c089
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M lib/gallery.show_full_size.js
Log Message:
-----------
Merge pull request #203 from shadlaws/fix_2052
#2052 - Revise gallery.show_full_size.js: update for new jQuery, refactor.
Commit: 24e720b48ea7ca8892374431727d42d9d1eac486
https://github.com/gallery/gallery3/commit/24e720b48ea7ca8892374431727d42d9d1eac486
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 390 for branch master
Last update: 5c137b655ba525da08e0a5d8eeeb5e9224651aaf (1 commits ago)
[ci skip]
Commit: 313f2abc0c2a4f90242810aef1cda5ea642f717a
https://github.com/gallery/gallery3/commit/313f2abc0c2a4f90242810aef1cda5ea642f717a
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M lib/gallery.common.js
M modules/server_add/js/server_add.js
M themes/wind/js/ui.init.js
M themes/wind/views/photo.html.php
Log Message:
-----------
Merge pull request #205 from shadlaws/fix_2053
#2053 - Change all .bind() to .on() for jQuery future-proofing.
Commit: ff5f386320b150fe3e33440c0dba4c71bc1830ef
https://github.com/gallery/gallery3/commit/ff5f386320b150fe3e33440c0dba4c71bc1830ef
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 391 for branch master
Last update: 24e720b48ea7ca8892374431727d42d9d1eac486 (1 commits ago)
[ci skip]
Commit: ac5aef6d335cacd4b10d31162e24b7af54a7aace
https://github.com/gallery/gallery3/commit/ac5aef6d335cacd4b10d31162e24b7af54a7aace
Author: Bharat Mediratta <[email protected]>
Date: 2013-03-11 (Mon, 11 Mar 2013)
Changed paths:
M .build_number
M .gitignore
M README.md
R lib/flowplayer-flash/flowplayer.controls.swf
R lib/flowplayer-flash/flowplayer.js
R lib/flowplayer-flash/flowplayer.pseudostreaming-byterange.swf
R lib/flowplayer-flash/flowplayer.pseudostreaming.swf
R lib/flowplayer-flash/flowplayer.swf
R lib/flowplayer-html5/flowplayer.js
R lib/flowplayer-html5/flowplayer.swf
R lib/flowplayer-html5/skin/all-skins.css
R lib/flowplayer-html5/skin/functional.css
R lib/flowplayer-html5/skin/img/black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/play_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_black.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/playful_white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/img/white.png
R lib/flowplayer-html5/skin/img/[email protected]
R lib/flowplayer-html5/skin/minimalist.css
R lib/flowplayer-html5/skin/playful.css
M lib/gallery.common.js
M lib/gallery.show_full_size.js
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
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 modules/g2_import/views/admin_g2_import.html.php
M modules/gallery/classes/Model/item.php
M modules/gallery/helpers/gallery_theme.php
M modules/gallery/helpers/movie.php
M modules/gallery/helpers/system.php
M modules/gallery/tests/xss_data.txt
M modules/gallery/views/admin_movies.html.php
R modules/gallery/views/movieplayer-flash.html.php
A modules/gallery/views/movieplayer.html.php
M modules/gallery_unit_test/controllers/gallery_unit_test.php
M modules/organize/vendor/ext/css/ext-all.css
M modules/organize/vendor/ext/css/ux-all.css
M modules/organize/vendor/ext/images/default/panel/tool-sprites.gif
M modules/organize/vendor/ext/js/ext-organize-bundle.js
M modules/server_add/js/server_add.js
M modules/server_add/views/admin_server_add.html.php
M modules/tag/helpers/tag_theme.php
M themes/wind/css/screen.css
M themes/wind/js/ui.init.js
M themes/wind/views/photo.html.php
Log Message:
-----------
Merge branch 'master' into kohana_3
Compare: https://github.com/gallery/gallery3/compare/8bffec3520c5...ac5aef6d335c
------------------------------------------------------------------------------
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 ]