Commit Graph
4723 Commits
Author SHA1 Message Date
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
Chad Kieffer 7deed86545 Removed incomplete jquery carousel code 2011-04-22 12:54:25 -04:00
Chad Kieffer 3bce5d00ee Renamed apple_touch_url to apple_touch_icon_url. 2011-04-22 12:50:21 -04:00
Chad Kieffer fbf02970e1 Merge branch 'master' of git://github.com/gallery/gallery3 2011-04-22 12:38:10 -04:00
Chad Kieffer 4a9b45c9c3 Created apple-touch-icon and added to wind and admin_wind themes. 2011-04-22 12:37:28 -04:00
Bharat Mediratta deb7db6486 Clear the site status for missing themes when we view this page -- if
something goes wrong we'll just add it back again anyway.  Follow-on
for #1655.
2011-04-22 09:29:25 -07:00
Bharat Mediratta 11703b24ff Detect if the users theme is missing (or missing a theme.info) and in
that case fall back to the wind theme.  Fixes #1655.
2011-04-22 09:28:19 -07:00
Bharat Mediratta 72149b8c68 Urlencode the tag name so that our html is compliant. Fixes #1672. 2011-04-22 08:11:56 -07:00
Bharat Mediratta 99fd65ff02 Catch the item_updated_data_file() event and rescan. Fixes #1679. 2011-04-22 07:55:34 -07:00
Bharat Mediratta 08a6df2274 Normally Router::find_uri() strips off the url suffix for us, but when
we make the theme::$is_admin determination we're working off of the
PATH_INFO so we need to strip it off manually.  Fixes #1631.
2011-04-21 15:50:53 -07:00
Bharat Mediratta 8cf066b838 Use Tag_Model::url() instead of hand creating tag urls, since the API
changed and that broke.  Fixe #1680.
2011-04-21 15:43:48 -07:00
Bharat Mediratta 5bc0da3652 Create before_combine and after_combine events to allow modules and themes to
interact with the combine list ahead of time, and to be able to do things like
minification after it's combined.  Fixes #1653.
2011-04-21 14:33:08 -07:00
Chris KellyandBharat Mediratta 1af4f99108 Add missing CSS tag so tables get aligned. Fixes #1678. 2011-04-21 14:01:02 -07:00
Bharat Mediratta 9fe2056106 Use window.location = "url" instead of window.location.reload() so
that we pop back up to the top of the page so that you see the status
message.  Fixes #1676.
2011-04-21 13:59:03 -07:00
Bharat Mediratta 916b7543d1 Gracefully degrade in the case where the .build_number file is
missing.  Fixes #1673.
2011-04-10 13:46:28 -07:00
Bharat Mediratta 5b927a7083 Guard against registered users removing tags from items they don't own. Fixes #1671. 2011-04-04 17:45:09 -07:00
Andy Lindeman 1d0f4b7a43 [Fixes #1574] Render the login form in the same way in every action
This makes sure the "Forgot Your Password?" link appears when the HTML form
is initially rendered.
2011-04-03 15:47:46 -05:00
Bharat Mediratta 213e652955 Merge branch 'Ticket#1666_reset' of git://github.com/Joe7/gallery3 2011-04-02 16:20:07 -07:00
Bharat Mediratta 531baea2d9 Merge branch 'Ticket#1667' of git://github.com/Joe7/gallery3 2011-04-02 16:07:13 -07:00
mamouneyyaandBharat Mediratta 5931cc872d proposed fix for ticket #1664 2011-04-02 15:59:54 -07:00