stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-31 00:39:11 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,690 Commits 4 Branches 0 Tags
72f3fc46f6c7c9043e730063051ecfd88bf314c8
Commit Graph

4335 Commits

Author SHA1 Message Date
Chad Parry
72f3fc46f6 Avoid "self::" because Kohana can't override it. 2011-05-04 17:22:15 -06:00
Chad Parry
13dbd3515b Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto 2011-04-30 20:33:02 -06:00
Chad Parry
f0f094c3f7 Explain the conditional rename in item::save() with a comment. 2011-04-30 20:22:49 -06:00
Chad Parry
1b3a6b85c1 Improve the comment explaining why the data_file extension is important. 2011-04-30 18:29:34 -06:00
Chad Parry
c3e8c1e3b5 The data_file field is public, so we don't need to supply an accessor method. 2011-04-30 18:12:56 -06: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
2375a02e2c Change the signature of system::tempnam to something more appropriate for Gallery. 2011-04-30 16:40:55 -06:00
Chad Parry
a8ca9dcf9e Change the name of the extensions helper to legal_file. 2011-04-30 16:10:06 -06:00
Chad Parry
7e61a01a96 Change the name of the extensions helper to legal_file. 2011-04-30 16:08:49 -06:00
Chad Parry
4c2b2ebd3f Remove a newline at the end of the file that I accidentally introduced. 2011-04-27 20:52:35 -06:00
Chad Parry
6d564f185e Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto 2011-04-27 20:35:58 -06:00
Tim Almdal
4e20e71d03 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-27 19:30:00 -07:00
Chad Parry
7ff485fa48 Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class. 2011-04-27 20:29:06 -06: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
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
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
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
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
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
Bharat Mediratta
41bc967808 Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-04-24 22:57:24 -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
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
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
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
f4d76a8abe Don't put the Admin > Theme Options Save button in a fieldset. 2011-04-24 13:56:39 -04:00
Bharat Mediratta
f8493a1df2 Revert my two "fixes" on top of Andy's tag combine change. Leave Tag_Model::items() calling 
Item_Model::viewable() because it's too dangerous to separate that out, and it's fragile to
rely on only admins doing tag combines.

Revert "Undo the change made in 5ce8563632 because it messes up tag counts"
- This reverts commit 67d2e8081c.
Revert "Move the calculation for item_related_update ahead of the duplicate"
- This reverts commit 5ce8563632.
 2011-04-24 08:59:33 -07:00
Chad Kieffer
90458673f4 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-24 11:56:12 -04:00
Chad Kieffer
b4cdd016dc Third times the charm. Rethink unordered lists and bullets. Revert to turning them off by default and provide a new class, g-text, to define a list or a section of text as needing to display bullets. 2011-04-24 11:53:29 -04:00
Bharat Mediratta
b89c40242f Sentence-case the url. Fixes #1706. 2011-04-24 07:49:41 -07:00
Chad Parry
26585fed03 Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto 2011-04-24 08:28:39 -06:00
Tim Almdal
7f48671186 For ticket #1701. Remove unused variable. 2011-04-24 07:15:30 -07:00
Chad Parry
809567f128 Expose the data file field. 2011-04-24 08:10:04 -06:00
Tim Almdal
41f90e669f Clarify the meaning of variable names. 2011-04-24 07:04:11 -07:00
Chad Parry
fcb06bf175 Don't assign to the item->name field if the name is unchanged, because the save method will crash. 2011-04-24 00:45:12 -06:00
Chad Parry
c6ef706d70 Preserve old data files long enough for them to be available to event handlers. 2011-04-23 22:55:59 -06:00
Tim Almdal
c01a0eac9a Allow the tag rename function to split a tag into multiple tags if a comma is used to delinate the seperate tags. 2011-04-23 20:30:30 -07:00
Chad Parry
0d6a3a3cfc Create a tempnam substitute that safely creates files with a given extension. 2011-04-23 21:19:47 -06:00
Bharat Mediratta
c3b0c96460 Revert 0235c2062e and instead apply the fix from 
iptox.net listed here: http://gallery.menalto.com/node/98768#comment-372398

Fixes for #1681, #1625
 2011-04-23 19:59:54 -07:00
Bharat Mediratta
67d2e8081c Undo the change made in 5ce8563632 because it messes up tag counts 
(and makes the test fail-- I should have run that!).

Also, use Tag_Model::items() in save() to avoid code duplication.  Follow-on for #1628.
 2011-04-23 16:12:10 -07:00
Chad Parry
e149cf7238 Support data files that change their extension and MIME type. 2011-04-23 16:39:25 -06:00
Chad Parry
6702104f57 Resolve an infinite recursion that happens when the path caches are updated during saving. 2011-04-23 16:35:00 -06:00
Bharat Mediratta
3ceeddde7c Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 15:19:13 -07:00
Bharat Mediratta
dfd50a6c1f Partially revert the CSS change in 76a7ad3161 
to center the "Select..." button because it was causing the SWF object to
vanish in Firefox.  #1638.
 2011-04-23 15:18:23 -07:00
Tim Almdal
92c23ea92d Set the width of the information column to 60px to prevent icon wrap 2011-04-23 15:10:04 -07:00
Bharat Mediratta
c07af35a19 Oops, fix broken codex urls. For #1698. 2011-04-23 14:53:39 -07:00
Bharat Mediratta
ba20d5a500 Oops, this is the rest of the modules and themes for #1696 and #1698. 2011-04-23 14:46:07 -07:00
Bharat Mediratta
923b5ae20a Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 14:44:48 -07:00
Bharat Mediratta
a469146084 module.info and theme.info files now support author name, author url, 
info url and discussion url fields.  Those fields show up in the Admin
> Modules and Admin > Appearance > Theme Choice pages.  All official
modules and themes updated to contain these values.  Fixes #1696, #1698.
 2011-04-23 14:43:33 -07:00