[gallery/gallery3] 6980ed: add the image size (in pixels) to the info module

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

  Branch: refs/heads/kohana_3
  Home:   https://github.com/gallery/gallery3
  Commit: 6980eddc9bb634c2c461a77d774e631133d5b54e
      https://github.com/gallery/gallery3/commit/6980eddc9bb634c2c461a77d774e631133d5b54e
  Author: jamaa <[email protected]>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M modules/info/classes/Info/Hook/InfoBlock.php
    M modules/info/classes/Info/Hook/InfoInstaller.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

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php


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

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

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php


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

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

allow for sequential upgrades

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php


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

  Changed paths:
    M modules/info/classes/Info/Hook/InfoBlock.php

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

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


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

  Changed paths:
    M modules/info/classes/Info/Hook/InfoBlock.php
    M modules/info/classes/Info/Hook/InfoInstaller.php

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

Conflicts:
	modules/info/classes/Info/Hook/InfoInstaller.php


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

  Changed paths:
    M modules/info/classes/Info/Hook/InfoBlock.php
    M modules/info/classes/Info/Hook/InfoInstaller.php

  Log Message:
  -----------
  Fix up a couple of cases where we were using Gallery 3.0.x idioms


Compare: https://github.com/gallery/gallery3/compare/77eb49f4cd95...210a1cbab378

----==_mimepart_51b901b4b62ac_101f87bdd884945
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_51b901b4b62ac_101f87bdd884945
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_51b901b4b62ac_101f87bdd884945--