Commit Graph
6672 Commits
Author SHA1 Message Date
Chad Parry d2d37fe3f2 Results from a round of feedback with Bharat.
Squashed commit of the following:

commit 13dbd3515b
Merge: f0f094c 97400b7
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:33:02 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit f0f094c3f7
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:22:49 2011 -0600

    Explain the conditional rename in item::save() with a comment.

commit 1b3a6b85c1
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:29:34 2011 -0600

    Improve the comment explaining why the data_file extension is important.

commit c3e8c1e3b5
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:12:56 2011 -0600

    The data_file field is public, so we don't need to supply an accessor method.

commit 2375a02e2c
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:40:55 2011 -0600

    Change the signature of system::tempnam to something more appropriate for Gallery.

commit a8ca9dcf9e
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:10:06 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 7e61a01a96
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:08:49 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 4c2b2ebd3f
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f128
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f57
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa0
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b79
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
2011-04-30 21:33:20 -06:00
Chad Parry 3a6b743866 Merge branch 'master' into rawphoto-squash 2011-04-30 21:32:33 -06:00
Automatic Build Number Updater 97400b7815 Automated update of .build_number to 147 for branch master
Last update: c2f20c0c4a (1 commits ago)
2011-04-30 15:44:54 -07:00
Bharat Mediratta 9e080efff3 Differentiate between invalid, missing and broken G2 configs and
present the user with feedback in the form.  Fixes #1727.
2011-04-30 15:44:24 -07:00
Chad Parry b875368167 This patch helps provide raw photo support with some small changes to the framework. Items can now change their extension and MIME type.
Squashed commit of the following:

commit 4c2b2ebd3f
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f128
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f57
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa0
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b79
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
2011-04-28 19:41:44 -06:00
Automatic Build Number Updater c2f20c0c4a Automated update of .build_number to 146 for branch master
Last update: 4060640876 (1 commits ago)
2011-04-28 11:36:19 -07:00
Chad Kieffer a486ce9f98 Merged pull request #50 from mamouneyya/master.
As of ckieffer request
2011-04-28 11:36:10 -07:00
mamouneyya 4ca2c5fbad remove .rtl class from properties as they're now separated in a different file that is being called after screen.css. Also reset the left margin for list elements 2011-04-28 19:46:01 +03:00
Automatic Build Number Updater 4060640876 Automated update of .build_number to 145 for branch master
Last update: b57dd202db (2 commits ago)
2011-04-27 19:30:28 -07:00
Tim Almdal 4e20e71d03 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-27 19:30:00 -07:00
Automatic Build Number Updater 7577d02fe2 Automated update of .build_number to 144 for branch master
Last update: 192cb124aa (3 commits ago)
2011-04-26 21:45:28 -07:00
Chad Kieffer 77d5c86699 Merge branch 'master' of github.com:gallery/gallery3 2011-04-26 22:44:50 -06:00
Chad Kieffer 2e6967e8a0 Add right padding to list elements in the new g-text class. 2011-04-26 22:44:21 -06:00
Automatic Build Number Updater b7bc8f4818 Automated update of .build_number to 143 for branch master
Last update: 192cb124aa (1 commits ago)
2011-04-26 21:39:14 -07:00
Chad Kieffer 4fa46d6a04 Move wind and admin_wind RTL style definitions out to their own file. Call that file when an RTL language is selected. 2011-04-26 22:38:53 -06:00
Automatic Build Number Updater 192cb124aa Automated update of .build_number to 142 for branch master
Last update: c6d1d6a6ae (5 commits ago)
2011-04-26 21:05:12 -07:00
Bharat Mediratta cd166c2070 Merge branch 'master' of github.com:gallery/gallery3 2011-04-26 21:04:56 -07:00
Bharat Mediratta 743e2f88d8 Overhaul the Admin > Content > Comments page. Use a tabbed interface
for consistency with other parts of the admin UI (ie: G2 import).

The UI is now Ajax driven because that's how jQuery tabs works best in
this case.  This requires a little finagling in JS to get the
paginator links to load properly.  While I'm in there, add a paginator
at the top of the table, make the buttons in the delete tab sane and
smooth scroll back to the top of the tab when switching pages.

Fixes #1702
2011-04-26 21:02:43 -07:00
Bharat Mediratta 77875e2fab Include jquery.scrollTo.js. Fixes #1720. 2011-04-26 21:01:58 -07:00
Bharat Mediratta 466b24307c Hide the paginator when there are no children. #1721. 2011-04-26 21:01:36 -07:00
Automatic Build Number Updater ebdc97b140 Automated update of .build_number to 141 for branch master
Last update: c6d1d6a6ae (1 commits ago)
2011-04-26 09:49:52 -07:00
Bharat Mediratta 5cf38ed816 Stop using Pagination() and instead use $theme->pager() in views.
Move the pager() function up to Gallery_View and replace
themes/admin_wind/views/pager.html.php (Pagination based) with a
modified version from the wind theme in
themes/admin_wind/views/paginator.html.php.  Fixes #1718.
2011-04-26 09:48:21 -07:00
Automatic Build Number Updater c6d1d6a6ae Automated update of .build_number to 140 for branch master
Last update: 10f117238a (10 commits ago)
2011-04-25 23:27:54 -07:00
Bharat Mediratta 0b37e442ce Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 23:27:25 -07:00
Bharat Mediratta cbd04e1ae0 Move random::string() to be test::random_string() and have it return a
random string of any length.  Also introduce test::lorem_ipsum() and
use that in places where we want strings of words.  Fixes #1713.
2011-04-25 23:26:43 -07:00
Automatic Build Number Updater 8665988ff3 Automated update of .build_number to 139 for branch master
Last update: 10f117238a (8 commits ago)
2011-04-25 22:16:29 -07:00
Bharat Mediratta 8814d7742d Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 22:15:58 -07:00
Bharat Mediratta 91c83874e5 Fix a bug introduced in 526859d960 where
we changed the behavior of the slug code and included the file
extension, not just the name.  This broke
Item_Model_Test::move_photo_with_conflicting_target_gets_uniqified_test
so yay for unit tests!  #1668
2011-04-25 22:15:34 -07:00
Automatic Build Number Updater b2327f97b4 Automated update of .build_number to 138 for branch master
Last update: 10f117238a (6 commits ago)
2011-04-25 22:09:12 -07:00
Bharat Mediratta 858e3a15b9 Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 22:08:48 -07:00
Bharat Mediratta 11af2bc93f Update test golden files. 2011-04-25 22:07:56 -07:00
Bharat Mediratta b0285f770e Add appropriate preamble. #1696, #1698 2011-04-25 22:07:47 -07:00
Automatic Build Number Updater 3c63494a2e Automated update of .build_number to 137 for branch master
Last update: 10f117238a (3 commits ago)
2011-04-24 23:08:19 -07:00
Bharat Mediratta 27bfa6a338 Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 23:07:47 -07:00
Bharat Mediratta 4e7524664a Show the tabs after the page has loaded to prevent Firefox from rendering the
unstyled page and then flashing.  Fixes #1705.
2011-04-24 23:04:50 -07:00
Automatic Build Number Updater 4ad94639a6 Automated update of .build_number to 136 for branch master
Last update: 10f117238a (1 commits ago)
2011-04-24 22:59:55 -07:00
Bharat Mediratta 41bc967808 Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-04-24 22:57:24 -07:00
Automatic Build Number Updater 10f117238a Automated update of .build_number to 135 for branch master
Last update: 15f4657452 (5 commits ago)
2011-04-24 22:55:59 -07:00
Bharat Mediratta 751b9be674 Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 22:55:31 -07:00
Bharat Mediratta 8533420f5d Look for and return embed.php files in the autocomplete list if we can
find them.  Fixes #1708.
2011-04-24 22:55:08 -07:00
Automatic Build Number Updater 84407648fe Automated update of .build_number to 134 for branch master
Last update: 15f4657452 (3 commits ago)
2011-04-24 22:52:02 -07:00
Bharat Mediratta 729b62abec Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 22:51:54 -07:00
Bharat Mediratta 953be781dc Refactor the meat of g2_import::import_album() off into a separate
function so taht we can call it on the root album as well.  Fixes
2011-04-24 22:51:14 -07:00
Automatic Build Number Updater ded13a931a Automated update of .build_number to 133 for branch master
Last update: 15f4657452 (1 commits ago)
2011-04-24 22:46:26 -07:00
Bharat Mediratta 701c1fb12f Ignore the presort when transferring over sort orders. Fixes #1710. 2011-04-24 22:45:45 -07:00
Chad Kieffer 1950f9c466 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-24 23:05:03 -06:00
Automatic Build Number Updater 15f4657452 Automated update of .build_number to 132 for branch master
Last update: 6100de33ac (1 commits ago)
2011-04-24 21:03:16 -07:00
Bharat Mediratta ea2127c3b2 Fix a bug introduced in f2477703fa which
was a fix for #1581 that caused us to skip adding highlights for any
albums that had no sub-albums.
2011-04-24 21:02:34 -07:00
Chad Kieffer 8e7a8fd2dc Add a bit of space below progress bars. Fixes #1703. 2011-04-24 14:09:03 -04:00
Chad Kieffer f4d76a8abe Don't put the Admin > Theme Options Save button in a fieldset. 2011-04-24 13:56:39 -04:00