[gallery/gallery3] c70646: Rename uploadify SWF wrappers to end in .swf.php f...

----==_mimepart_51b90466552a4_10191011de016727e
Date: Wed, 12 Jun 2013 16:29:42 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <51b90466565bf_10191011de0167352-P8FJ25gi/wisHj0ehI8gLCqyDsTP4bNorxkAB0y/[email protected]>

  Branch: refs/heads/kohana_3
  Home:   https://github.com/gallery/gallery3
  Commit: c70646237e90e998259b72ae9c2497ad1f384432
      https://github.com/gallery/gallery3/commit/c70646237e90e998259b72ae9c2497ad1f384432
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    R lib/uploadify/uploadify.allglyphs.php
    A lib/uploadify/uploadify.allglyphs.swf.php
    R lib/uploadify/uploadify.php
    A lib/uploadify/uploadify.swf.php
    M modules/gallery/tests/File_Structure_Test.php
    M modules/gallery/tests/xss_data.txt
    M modules/gallery/views/form_uploadify.html.php

  Log Message:
  -----------
  Rename uploadify SWF wrappers to end in .swf.php for consistency.


  Commit: 0aebd9e9f633a488c3b9bb83f72d638d1871efaa
      https://github.com/gallery/gallery3/commit/0aebd9e9f633a488c3b9bb83f72d638d1871efaa
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M .build_number

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


  Commit: 683ab45d5436ce224125420a81d1f0135d1f9c28
      https://github.com/gallery/gallery3/commit/683ab45d5436ce224125420a81d1f0135d1f9c28
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 419 for branch master
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (3 commits ago)
[ci skip]


  Commit: ac804d870055de57a7f2a27bf849a4a92a788d2f
      https://github.com/gallery/gallery3/commit/ac804d870055de57a7f2a27bf849a4a92a788d2f
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Drop PHP 5.5 - it's segfaulting on Travis and it's not released yet anyway.


  Commit: 7ebdc1bb2f4504b518125172a639f04044f1d3b7
      https://github.com/gallery/gallery3/commit/7ebdc1bb2f4504b518125172a639f04044f1d3b7
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M .build_number

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


  Commit: 53d3fa81252f1c033cb3c462b1714865088139cb
      https://github.com/gallery/gallery3/commit/53d3fa81252f1c033cb3c462b1714865088139cb
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 420 for branch master
Last update: d81ed1145dfa57d17c2bb5e7505e2f2af62c823e (5 commits ago)
[ci skip]


  Commit: 3c100d06ff10d12b1b6b960ba52c5206bac855c4
      https://github.com/gallery/gallery3/commit/3c100d06ff10d12b1b6b960ba52c5206bac855c4
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M modules/gallery/helpers/data_rest.php

  Log Message:
  -----------
  #2074 - Mirror some additional file_proxy checks in data_rest.


  Commit: b024c07036b53b61a73c255447333686585315f5
      https://github.com/gallery/gallery3/commit/b024c07036b53b61a73c255447333686585315f5
  Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M modules/gallery/helpers/data_rest.php

  Log Message:
  -----------
  Merge pull request #396 from shadlaws/fix_2074_master

#2074 - Mirror some additional file_proxy checks in data_rest.


  Commit: 47803a2d46df8f567639ba7f6d2afb63655afc19
      https://github.com/gallery/gallery3/commit/47803a2d46df8f567639ba7f6d2afb63655afc19
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M .build_number

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


  Commit: 632285ee0c7d9b8aa89c1197739b5a521f9c5e9c
      https://github.com/gallery/gallery3/commit/632285ee0c7d9b8aa89c1197739b5a521f9c5e9c
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/helpers/info_block.php
    M modules/info/helpers/info_installer.php
    M modules/info/module.info

  Log Message:
  -----------
  add the image size (in pixels) to the info module

adds a new variable "show_size", so had to increment the version number
to 3


  Commit: 5d8ac644a5db74c9ca3bf563e80643233b49e28c
      https://github.com/gallery/gallery3/commit/5d8ac644a5db74c9ca3bf563e80643233b49e28c
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/helpers/info_installer.php

  Log Message:
  -----------
  fix whitespace


  Commit: ad634512756b11569cb649ce4322e9ec2c59eb5f
      https://github.com/gallery/gallery3/commit/ad634512756b11569cb649ce4322e9ec2c59eb5f
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/helpers/info_installer.php

  Log Message:
  -----------
  fix upgrade function

allow for sequential upgrades


  Commit: 8b14cc5a78ca7cd86ead250916f3437af7bf77af
      https://github.com/gallery/gallery3/commit/8b14cc5a78ca7cd86ead250916f3437af7bf77af
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/helpers/info_block.php

  Log Message:
  -----------
  internationalize image size display

as per comment
https://github.com/gallery/gallery3/pull/394/files#r4643737


  Commit: 2d2503680ec3cd90d07a871a71a8e6d2f21c6c3d
      https://github.com/gallery/gallery3/commit/2d2503680ec3cd90d07a871a71a8e6d2f21c6c3d
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/helpers/info_block.php
    M modules/info/helpers/info_installer.php

  Log Message:
  -----------
  change "size" to "dimensions" and display unit "px"


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

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 422 for branch master
Last update: 47803a2d46df8f567639ba7f6d2afb63655afc19 (5 commits ago)
[ci skip]


  Commit: 1756203d85fe554755370c0016ea40a8b925fc5f
      https://github.com/gallery/gallery3/commit/1756203d85fe554755370c0016ea40a8b925fc5f
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M .build_number
    M .travis.yml
    M modules/gallery/tests/File_Structure_Test.php
    M modules/gallery/tests/xss_data.txt
    M modules/info/classes/Info/Hook/InfoBlock.php

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

Conflicts:
	lib/uploadify/uploadify.swf.php
	modules/gallery/helpers/data_rest.php
	modules/gallery/orphans/views/form_uploadify.html.php
	modules/gallery/tests/File_Structure_Test.php
	modules/info/classes/Info/Hook/InfoBlock.php
	modules/info/classes/Info/Hook/InfoInstaller.php


Compare: https://github.com/gallery/gallery3/compare/210a1cbab378...1756203d85fe

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

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
----==_mimepart_51b90466552a4_10191011de016727e
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_51b90466552a4_10191011de016727e--