From: GitHub <no...@gi...> - 2013-04-30 17:36:45
|
Branch: refs/heads/kohana_3 Home: https://github.com/gallery/gallery3 Commit: 43a6a938f5e813ac1ebad221675af3ea799a513c https://github.com/gallery/gallery3/commit/43a6a938f5e813ac1ebad221675af3ea799a513c Author: Bharat Mediratta <bh...@me...> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M modules/gallery/tests/ORM_MPTT_Test.php Log Message: ----------- Add a test to verify that calling viewable() before MPTT relationships will fail. Commit: 4b399897b722ea0e975151838508ff493618e687 https://github.com/gallery/gallery3/commit/4b399897b722ea0e975151838508ff493618e687 Author: Bharat Mediratta <bh...@me...> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M modules/gallery/classes/Gallery/Model/Item.php M modules/gallery/classes/Gallery/View/Theme.php M modules/gallery/tests/Item_Model_Test.php Log Message: ----------- Change Item::children() and Item::descendants() to use the new relationship approach and add sort orders on as appropriate. Once you add a sort order, you can't remove it, so I created an unordered_children relationship that does not add the ordering by default and fixed the one place that uses it. For all the rest of them, the pre-existing behavior is maintained (we use the album's sort order by default when requesting the children and descendants relationships). Commit: e7f67cf32f4b3633d98e6b8ab65322380345b7f4 https://github.com/gallery/gallery3/commit/e7f67cf32f4b3633d98e6b8ab65322380345b7f4 Author: Bharat Mediratta <bh...@me...> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M modules/formo/classes/Formo/Core/Innards.php M modules/gallery/classes/Gallery/Auth.php M modules/gallery/classes/Gallery/Controller/Admin.php M modules/gallery/classes/Gallery/Controller/Admin/AdvancedSettings.php M modules/gallery/classes/Gallery/Controller/FileProxy.php M modules/gallery/classes/Gallery/Controller/Login.php M modules/gallery/classes/Gallery/Controller/Reauthenticate.php M modules/gallery/classes/Gallery/Formo.php M modules/gallery/classes/Gallery/Hook/Rest/Data.php M modules/gallery/classes/Gallery/Response.php M modules/gallery/views/formo/field_template.php M modules/gallery/views/formo/form_template.php M modules/gallery/views/formo/group_template.php M modules/gallery/views/gallery/reauthenticate.html.php M modules/purifier/classes/Purifier.php Log Message: ----------- Merge branch 'kohana_3' of github.com:gallery/gallery3 into kohana_3 Compare: https://github.com/gallery/gallery3/compare/4374541482ab...e7f67cf32f4b |