[prev in list] [next in list] [prev in thread] [next in thread]
List: gallery-checkins
Subject: [Gallery-checkins] [gallery/gallery3] 7f2b29: Merge pull request #412 from shadlaws/master
From: GitHub <noreply () github ! com>
Date: 2013-06-17 12:06:06
Message-ID: 51befbae27091_13ed12bdddc5715 () hookshot-fe3-pe1-prd ! aws ! github ! net ! mail
[Download RAW message or body]
Branch: refs/heads/kohana_3
Home: https://github.com/gallery/gallery3
Commit: 7f2b2990641197702c0bbad6632873d70e91904c
https://github.com/gallery/gallery3/commit/7f2b2990641197702c0bbad6632873d70e91904c
Author: Shad Laws <shad@shadlaws.com>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
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
Log Message:
-----------
Merge pull request #412 from shadlaws/master
Update jQuery libraries (in sync with vendor)
Commit: a038f11a9f9843c264c6f9c8e564b65c3cac392e
https://github.com/gallery/gallery3/commit/a038f11a9f9843c264c6f9c8e564b65c3cac392e
Author: Automatic Build Number Updater \
<bharat+gallery3_build_number_updater@menalto.com> Date: 2013-06-16 (Sun, 16 Jun \
2013)
Changed paths:
M .build_number
Log Message:
-----------
Automated update of .build_number to 423 for branch master
Last update: a3d06cc5bca05cc1b892872f494e83a24837d06f (1 commits ago)
[ci skip]
Commit: 8a0c8f007715b3110c89c63e77a6fb927f4d3d6c
https://github.com/gallery/gallery3/commit/8a0c8f007715b3110c89c63e77a6fb927f4d3d6c
Author: shadlaws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
R modules/gallery/classes/Controller/Rest/User.php
A modules/gallery/classes/Controller/Rest/Users.php
R modules/gallery/classes/Gallery/Controller/Rest/User.php
A modules/gallery/classes/Gallery/Controller/Rest/Users.php
Log Message:
-----------
Rename Rest_Controller_User --> Rest_Controller_Users.
--HG--
rename : modules/gallery/classes/Controller/Rest/User.php => \
modules/gallery/classes/Controller/Rest/Users.php rename : \
modules/gallery/classes/Gallery/Controller/Rest/User.php => \
modules/gallery/classes/Gallery/Controller/Rest/Users.php
Commit: e843662ea5e64b790ef7815701f8a4e048f28f57
https://github.com/gallery/gallery3/commit/e843662ea5e64b790ef7815701f8a4e048f28f57
Author: shadlaws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M modules/gallery/classes/Controller/Rest/Users.php
M modules/gallery/classes/Gallery/Controller/Rest/Users.php
Log Message:
-----------
Fix class declarations for newly-renamed classes.
Commit: 05a6a1567da4cbbd020208e4f05e653656c6a435
https://github.com/gallery/gallery3/commit/05a6a1567da4cbbd020208e4f05e653656c6a435
Author: shadlaws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
R modules/comment/classes/Comment/Controller/Rest/Comment.php
M modules/comment/classes/Comment/Controller/Rest/Comments.php
M modules/comment/classes/Comment/Controller/Rest/ItemComments.php
R modules/comment/classes/Controller/Rest/Comment.php
R modules/gallery/classes/Controller/Rest/Item.php
M modules/gallery/classes/Gallery/Controller/Rest/Data.php
R modules/gallery/classes/Gallery/Controller/Rest/Item.php
M modules/gallery/classes/Gallery/Controller/Rest/Items.php
M modules/gallery/classes/Gallery/Controller/Rest/Tree.php
M modules/gallery/classes/Gallery/Controller/Rest/UserComments.php
M modules/gallery/classes/Gallery/Controller/Rest/UserItems.php
M modules/gallery/classes/Gallery/Controller/Rest/Users.php
M modules/rest/classes/Rest/Controller/Rest.php
M modules/rest/classes/Rest/Rest.php
M modules/rest/init.php
M modules/rest/views/admin/rest.html.php
M modules/search/classes/Search/Controller/Rest/Search.php
R modules/tag/classes/Controller/Rest/Tag.php
M modules/tag/classes/Tag/Controller/Rest/ItemTags.php
R modules/tag/classes/Tag/Controller/Rest/Tag.php
M modules/tag/classes/Tag/Controller/Rest/TagItems.php
M modules/tag/classes/Tag/Controller/Rest/Tags.php
Log Message:
-----------
Merge items/comments/tags/users REST resources from singular & plural versions.
- remove the singular versions of the resources.
- fix references in other resources.
- revise resource comments... a lot.
- tweak rest/init.php so old singular URLs get re-routed.
Commit: 974694df906de63f147581e27a1008fb680cd9b6
https://github.com/gallery/gallery3/commit/974694df906de63f147581e27a1008fb680cd9b6
Author: shadlaws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M modules/tag/classes/Tag/Controller/Rest/Tags.php
Log Message:
-----------
Add "web_url" field to REST tag resource.
Commit: 23bcc22c36d4c2da07aba3cd39e58294dfd3e952
https://github.com/gallery/gallery3/commit/23bcc22c36d4c2da07aba3cd39e58294dfd3e952
Author: shadlaws <shad@shadlaws.com>
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:
-----------
Update themeroller for v1.10.3 (in sync with vendor)
Commit: 1c5b6f4dceb62e161bc3410ed23e3bc3271a58ad
https://github.com/gallery/gallery3/commit/1c5b6f4dceb62e161bc3410ed23e3bc3271a58ad
Author: shadlaws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M .build_number
M themes/admin_wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
M themes/admin_wind/vendor/themeroller/ui.base.css
M themes/wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
M themes/wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
M themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
M themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
M themes/wind/vendor/themeroller/ui.base.css
Log Message:
-----------
Merge master --> kohana_3 after themeroller update.
--HG--
rename : themes/admin_wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png rename : \
themes/admin_wind/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png rename : \
themes/admin_wind/css/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png rename : \
themes/admin_wind/css/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png rename : \
themes/admin_wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png rename : \
themes/admin_wind/css/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png => \
themes/admin_wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png \
rename : themes/admin_wind/css/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png \
=> themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png \
rename : themes/admin_wind/css/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png \
=> themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png \
rename : themes/admin_wind/css/themeroller/ui.base.css => \
themes/admin_wind/vendor/themeroller/ui.base.css rename : \
themes/wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png => \
themes/wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png rename : \
themes/wind/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png => \
themes/wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png rename : \
themes/wind/css/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png => \
themes/wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png rename : \
themes/wind/css/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png => \
themes/wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png rename : \
themes/wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png => \
themes/wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png rename : \
themes/wind/css/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png => \
themes/wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png rename : \
themes/wind/css/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png => \
themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png rename : \
themes/wind/css/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png => \
themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename : \
themes/wind/css/themeroller/ui.base.css => themes/wind/vendor/themeroller/ui.base.css
Commit: f976a6a9b4b22dc7b09dd6d55533ccfe18d81683
https://github.com/gallery/gallery3/commit/f976a6a9b4b22dc7b09dd6d55533ccfe18d81683
Author: Shad Laws <shad@shadlaws.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M .build_number
R modules/comment/classes/Comment/Controller/Rest/Comment.php
M modules/comment/classes/Comment/Controller/Rest/Comments.php
M modules/comment/classes/Comment/Controller/Rest/ItemComments.php
R modules/comment/classes/Controller/Rest/Comment.php
R modules/gallery/classes/Controller/Rest/Item.php
R modules/gallery/classes/Controller/Rest/User.php
A modules/gallery/classes/Controller/Rest/Users.php
M modules/gallery/classes/Gallery/Controller/Rest/Data.php
R modules/gallery/classes/Gallery/Controller/Rest/Item.php
M modules/gallery/classes/Gallery/Controller/Rest/Items.php
M modules/gallery/classes/Gallery/Controller/Rest/Tree.php
R modules/gallery/classes/Gallery/Controller/Rest/User.php
M modules/gallery/classes/Gallery/Controller/Rest/UserComments.php
M modules/gallery/classes/Gallery/Controller/Rest/UserItems.php
A modules/gallery/classes/Gallery/Controller/Rest/Users.php
M modules/rest/classes/Rest/Controller/Rest.php
M modules/rest/classes/Rest/Rest.php
M modules/rest/init.php
M modules/rest/views/admin/rest.html.php
M modules/search/classes/Search/Controller/Rest/Search.php
R modules/tag/classes/Controller/Rest/Tag.php
M modules/tag/classes/Tag/Controller/Rest/ItemTags.php
R modules/tag/classes/Tag/Controller/Rest/Tag.php
M modules/tag/classes/Tag/Controller/Rest/TagItems.php
M modules/tag/classes/Tag/Controller/Rest/Tags.php
M themes/admin_wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
M themes/admin_wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
M themes/admin_wind/vendor/themeroller/ui.base.css
M themes/wind/vendor/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
M themes/wind/vendor/themeroller/images/ui-bg_flat_55_fbec88_40x100.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_75_d0e5f5_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_85_dfeffc_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
M themes/wind/vendor/themeroller/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
M themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
M themes/wind/vendor/themeroller/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
M themes/wind/vendor/themeroller/ui.base.css
Log Message:
-----------
Merge pull request #417 from shadlaws/fixes_20130617
Fixes 20130617
Compare: https://github.com/gallery/gallery3/compare/baff47c12937...f976a6a9b4b2
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-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 ]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic