Bharat Mediratta
57f7e42a12
Add the item id to the print_proxy line so that we have a little more info
...
about what the original was, and extend the timeout to 90 days from 10.
Fixes #1733 .
2011-05-08 11:42:40 -07:00
Bharat Mediratta
80dda6f64f
Merge pull request #52 from chadparry/tempnam
...
Fixes #1732
2011-05-06 11:48:13 -07:00
Bharat Mediratta
5bae21864f
Follow-on to 6f916e49d5 -- don't make
...
database calls if Gallery isn't installed, else we fail to bounce the
user to the installer on fresh packages. #1637 .
2011-05-05 14:52:47 -07:00
Chad Parry
46da011bf6
Remove a newline I accidentally introduced.
2011-05-04 17:51:00 -06:00
Chad Parry
5c6c71ffcd
Merge branch 'master' into tempnam
2011-05-04 17:49:42 -06:00
Chad Parry
d2331bf434
Simplified the temp_filename implementation and removed the mocks.
2011-05-04 17:48:25 -06:00
Bharat Mediratta
229bfc5c7c
Track and redirect core.DownloadItem requests properly. This can
...
happen if the G2 was imported with rewrite on, so the g2_url in the
g2_map table has a shortened url, but then rewrite is disabled and the
.htaccess mod_rewrite rules are sending over a &g2_view=core.DownloadItem
request. Fixes #1728 .
2011-05-02 21:37:04 -07:00
Bharat Mediratta
68370b92f5
Map the G2 album highlight thumbnail derivative id to the G3 album's
...
thumbnail. Fixes #1729 .
2011-05-02 21:36:17 -07:00
Chad Parry
0e844766ba
Change the signature of system::tempnam to something more appropriate for Gallery.
2011-04-30 17:45:44 -06:00
Chad Parry
5c9a3b3f39
Create a tempnam substitute that safely creates files with a given extension.
2011-04-30 17:45:44 -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
Tim Almdal
4e20e71d03
Merge branch 'master' of git@github.com:gallery/gallery3
2011-04-27 19:30:00 -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
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 5ce856363267d2e8081c5ce8563632
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
Tim Almdal
7f48671186
For ticket #1701 . Remove unused variable.
2011-04-24 07:15:30 -07:00
Tim Almdal
41f90e669f
Clarify the meaning of variable names.
2011-04-24 07:04:11 -07: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
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
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
Tim Almdal
7ec0cc748a
Fix for ticket #1699 . Make the link to return to the gallery installation clearer.
2011-04-23 13:55:23 -07:00
Bharat Mediratta
22e6542fa6
Merge branch 'upgrade_flowplayer' of git://github.com/alindeman/gallery3 into andy
2011-04-23 13:28:36 -07:00
Andy Lindeman
cc8d881973
Add iPad/iPhone support for video playback
...
* Resolves #1634
2011-04-23 16:20:54 -04:00
Bharat Mediratta
5ce8563632
Move the calculation for item_related_update ahead of the duplicate
...
tag merge so that we don't trigger an item_related_update on items
who semantically have the same tag after the merge. Follow-on for #1628 .
2011-04-23 13:20:22 -07:00
Bharat Mediratta
b57b229543
Merge branch 'alindeman/1628' of git://github.com/alindeman/gallery3 into andy
2011-04-23 13:16:27 -07:00
Bharat Mediratta
e241002008
Merge branch 'master' of git://github.com/ckieffer/gallery3 into chad
2011-04-23 13:11:01 -07:00
Bharat Mediratta
c1df782a75
Use an absolute url for the upgrader link. Also, clear the upgrade_now
...
site status message every time we go to Admin > Modules.
Fixes #1695 .
2011-04-23 13:04:48 -07:00
Bharat Mediratta
4d38c505cb
Further cleanup for minimum_password_length -- update
...
user_installer::initialize() with the right module version number for
the user module and fix the misspelling there then rebuild the
installer.sql. #1694 .
2011-04-23 12:55:30 -07:00
Bharat Mediratta
Chad Parry
Tim Almdal
Chad Kieffer
Andy Lindeman