[gallery/gallery3] dc7822: Merge pull request #416 from shadlaws/master_theme...

----==_mimepart_51cc2bac2693b_dfc144fde410706b
Date: Thu, 27 Jun 2013 05:10:20 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <51cc2bac27df7_dfc144fde410719d-P8FJ25gi/wh9XwKtGrALNyqyDsTP4bNorxkAB0y/[email protected]>

  Branch: refs/heads/kohana_3
  Home:   https://github.com/gallery/gallery3
  Commit: dc782203f4e06e96164c3a3dfd1f78c2d72b2a6b
      https://github.com/gallery/gallery3/commit/dc782203f4e06e96164c3a3dfd1f78c2d72b2a6b
  Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M themes/admin_wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
    M themes/admin_wind/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
    M themes/admin_wind/css/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
    M themes/admin_wind/css/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
    M themes/admin_wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
    M themes/admin_wind/css/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    M themes/admin_wind/css/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
    M themes/admin_wind/css/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
    M themes/admin_wind/css/themeroller/ui.base.css
    M themes/wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
    M themes/wind/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
    M themes/wind/css/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
    M themes/wind/css/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
    M themes/wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
    M themes/wind/css/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    M themes/wind/css/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
    M themes/wind/css/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
    M themes/wind/css/themeroller/ui.base.css

  Log Message:
  -----------
  Merge pull request #416 from shadlaws/master_themeroller_20130617

Update themeroller for v1.10.3 (in sync with vendor)


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

  Changed paths:
    M .build_number

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


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

  Changed paths:
    M modules/gallery/tests/Controller_Auth_Test.php
    M modules/gallery/tests/controller_auth_data.txt

  Log Message:
  -----------
  Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{".  Update golden file.

--HG--
extra : source : 816294dd5f6fe23160baf9f516e49c66ea8fcb6c


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

  Changed paths:
    M modules/gallery/tests/Controller_Auth_Test.php
    M modules/gallery/tests/controller_auth_data.txt

  Log Message:
  -----------
  Merge pull request #434 from shadlaws/fix_controller_auth_test_master

Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{".  Update golden file.


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

  Changed paths:
    M .build_number

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


  Commit: 9c3ac112e3e1f4939916f6f039f6e1dbbe14aaad
      https://github.com/gallery/gallery3/commit/9c3ac112e3e1f4939916f6f039f6e1dbbe14aaad
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Model/Item.php
    M modules/gallery/classes/Gallery/Random.php

  Log Message:
  -----------
  Change Random::percent() to generate an N-digit string-formatted decimal.


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

  Changed paths:
    M .build_number
    M modules/gallery/tests/Controller_Auth_Test.php
    M modules/gallery/tests/controller_auth_data.txt

  Log Message:
  -----------
  Merge master --> kohana_3


  Commit: 9488b6536c9772f58cb964274ef30abb833f4159
      https://github.com/gallery/gallery3/commit/9488b6536c9772f58cb964274ef30abb833f4159
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Controller/UserProfile.php
    M modules/rest/classes/RestAPI/Controller/RestUser.php

  Log Message:
  -----------
  Disallow guests from being contacted or resetting their REST API keys.


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

  Changed paths:
    M modules/comment/classes/Comment/Rest/Comments.php
    M modules/comment/classes/Comment/Rest/UserComments.php

  Log Message:
  -----------
  Ensure only viewable comments are shown in Rest_Comments / Rest_UserComments.


  Commit: 40ac39d6564676fc1cc7f9068ca26f4ddfa9501c
      https://github.com/gallery/gallery3/commit/40ac39d6564676fc1cc7f9068ca26f4ddfa9501c
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M modules/tag/classes/Tag/Rest/TagItems.php

  Log Message:
  -----------
  Enforce item edit permission in Rest_TagItems::post_members().


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

  Changed paths:
    M modules/gallery/tests/Controller_Auth_Test.php
    M modules/gallery/tests/controller_auth_data.txt

  Log Message:
  -----------
  Rewrite Controller_Auth_Test for Gallery 3.1.
- refactor code for ease of reading and extendability
- change needles we search for in our haystacks to match K3, Formo, etc.
- include rest resources along with controllers and rss feeds
- add comments to golden file so we can track *why* these cases are okay.


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

  Changed paths:
    M .build_number
    M modules/comment/classes/Comment/Rest/Comments.php
    M modules/comment/classes/Comment/Rest/UserComments.php
    M modules/gallery/classes/Gallery/Controller/UserProfile.php
    M modules/gallery/classes/Gallery/Model/Item.php
    M modules/gallery/classes/Gallery/Random.php
    M modules/gallery/tests/Controller_Auth_Test.php
    M modules/gallery/tests/controller_auth_data.txt
    M modules/rest/classes/RestAPI/Controller/RestUser.php
    M modules/tag/classes/Tag/Rest/TagItems.php

  Log Message:
  -----------
  Merge pull request #435 from shadlaws/fixes_20130627

Fixes 20130627


Compare: https://github.com/gallery/gallery3/compare/50a9da503062...909936c787a6

----==_mimepart_51cc2bac2693b_dfc144fde410706b
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_51cc2bac2693b_dfc144fde410706b
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_51cc2bac2693b_dfc144fde410706b--