stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 19:39:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,607 Commits 4 Branches 0 Tags
bbb2a3a30c57592b1baed17533bc3a2e7edb2e8a
Commit Graph

4291 Commits

Author SHA1 Message Date
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
59d5ddc8ab Set the default value for gallery.timezone to null so that each install uses 
date_default_timezone_get() in modules/gallery/config/locale.php but it's
still overrideable in Admin > Settings > Advanced.  Follow on fix for #1637.
 2011-04-23 12:48:04 -07:00
Tim Almdal
b30afaeab7 Fix ticket #1694 (continued). Reset the corrected user module variable to the value of the incorrect spelling (don't assume that the original value was still 5. 2011-04-23 12:27:46 -07:00
Tim Almdal
466f2a657e Fix ticket #1694. Correct Spelling of mininum_password_length to minimum_password_length 2011-04-23 12:16:06 -07:00
Bharat Mediratta
01055fb54f Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 10:08:48 -07:00
Bharat Mediratta
76a7ad3161 Overhaul of the uploader code: 
- Propagate size limits (including detecting memory limits from GD) down to the
  Flash so that we don't even start uploads that won't work
- Improve the error messages to be more user meaningful and provide links to the
  codex for errors
- Tell the user up front what the file size limit is.

Fixes #1638
 2011-04-23 10:07:32 -07:00
Bharat Mediratta
ce2c6c3ada Add convert_to_human_readable and tests for both. Resolves #1693. 2011-04-23 10:06:17 -07:00
Andy Lindeman
c101151616 Allow tags to be merged by renaming 
* Fixes #1628
 2011-04-23 12:04:43 -04:00
Tim Almdal
84462d1f82 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-23 08:13:42 -07:00
Tim Almdal
0235c2062e Fix for ticket #1681 (and maybe #1625). Change the parameter from -v to -version. 2011-04-23 08:13:01 -07:00
Bharat Mediratta
993e49adda Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 08:08:43 -07:00
Bharat Mediratta
3312009319 Revive server_add.js which I accidentally removed in 80af9f0f17 
as part of #1686.
 2011-04-23 08:07:58 -07:00
Tim Almdal
9e97741ac4 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-23 07:46:54 -07:00
Tim Almdal
0ec819d381 Insure that the tag count to display is always greater than 0. Refixes #1649. 2011-04-23 07:46:38 -07:00
Bharat Mediratta
aa94900354 Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 07:42:54 -07:00
Tim Almdal
9dd91b55b0 Insure that the tag count to display is always greater than 1. Refixes #1649. 2011-04-23 07:42:28 -07:00
Bharat Mediratta
171e4fd0ee Remove displayed blocks from the admin block list. If there are no 
available blocks to add, just hide the block adder block.  Fixes #1689.
 2011-04-23 07:41:44 -07:00
Chad Kieffer
c2abd476c7 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-23 10:29:06 -04:00
Chad Kieffer
bb23e28035 Remove enumeration unordered list class, it's no longer needed. 2011-04-23 10:28:39 -04:00
Tim Almdal
a1f419435c Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-23 07:27:02 -07:00
Tim Almdal
4b01676f32 Fix for ticket #541 
Added a theme_info variable to the theme globals.  The properties in the theme.info file are now contained in this theme_info structure.

Access is:
  <?= $theme_info->author ?>
will display the theme author.
 2011-04-23 07:25:33 -07:00
Bharat Mediratta
07c266b973 Enable autocomplete for the embed path. Fixes #1687. 2011-04-23 07:20:58 -07:00
Bharat Mediratta
efa3466a75 Oops, forgot to remove the reference to admin.js. Follow-on for #1686. 2011-04-23 07:13:55 -07:00
Bharat Mediratta
80af9f0f17 Inline admin JS into admin_server_add.html.php. Fixes #1686. 2011-04-23 07:05:15 -07:00
Bharat Mediratta
fa4fb20f80 If we've cleared out the last group in a combine_queue for a given 
type, unset the combine_queue for that type entirely.  This way future
calls to css() and script() emit an element until there's a new call
to start_combining().  Fixes 1685.
 2011-04-23 06:50:47 -07:00
Bharat Mediratta
c2a38087dc A few more fixes for #1637: 
- Update gallery_installer::install() to set the version to 48 and
  set the timezone
- Rebuild installer.sql
 2011-04-22 16:52:48 -07:00
Bharat Mediratta
fcbb4eef23 Merge branch 'time-zone-improvements' of https://github.com/alindeman/gallery3 into alindeman-time-zone-improvements 2011-04-22 16:44:12 -07:00
Bharat Mediratta
5b9c47ae6a Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 16:31:12 -07:00
Bharat Mediratta
5040adebb5 Totally revamp the G2 Import UI to make it sexxxy. Fixes #1683. 2011-04-22 16:30:37 -07:00
Tim Almdal
b07bc1af08 Allow the administrator to set the number of tags to display in the cloud via the advanced settings. Fixes ticket #1649. 2011-04-22 16:15:56 -07:00
Andy Lindeman
6f916e49d5 Allow timezone to be configurable 
* Fixes #1637
* New advanced setting gallery/timezone
* Default setting comes from PHP
 2011-04-22 18:15:17 -04:00
Tim Almdal
b10e6f6671 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-22 15:02:38 -07:00
Tim Almdal
d7e2990152 Insure that the number of items for a page is greater than zero. Fixes ticket 1644. 2011-04-22 15:02:30 -07:00
Bharat Mediratta
526859d960 Do simple transliteration when converting filenames to slugs, but check 
to see if the transliteration module is available and use a more complex
transliteration if possible.  Fixes #1668.
 2011-04-22 13:57:46 -07:00