Commit Graph

6487 Commits

Author SHA1 Message Date
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
f2009fa21e Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 16:39:30 -07:00
Bharat Mediratta
351174f858 Merge branch 'ie9' of https://github.com/alindeman/gallery3 into alindeman-ie9 2011-04-22 16:39:18 -07:00
Automatic Build Number Updater
16ffc81faf Automated update of .build_number to 96 for branch master
Last update: 5af74d4714 (3 commits ago)
2011-04-22 16:31:52 -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
Andy Lindeman
100218e3ec Patch jQuery UI to fix drag-and-drop events in IE9
* Fixes #1642
2011-04-22 19:25:23 -04:00
Automatic Build Number Updater
e14b954f18 Automated update of .build_number to 95 for branch master
Last update: 151d5c3f35 (1 commits ago)
2011-04-22 16:16:14 -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
Automatic Build Number Updater
151d5c3f35 Automated update of .build_number to 94 for branch master
Last update: 5af74d4714 (2 commits ago)
2011-04-22 15:02:24 -07: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
Automatic Build Number Updater
b9a720e86b Automated update of .build_number to 93 for branch master
Last update: 5af74d4714 (1 commits ago)
2011-04-22 13:58:37 -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
Automatic Build Number Updater
5af74d4714 Automated update of .build_number to 92 for branch master
Last update: 2fcd53052b (1 commits ago)
2011-04-22 11:48:17 -07:00
Bharat Mediratta
05e031d403 Follow on fix for #1645 to update the installer.sql 2011-04-22 11:47:38 -07:00
Automatic Build Number Updater
2fcd53052b Automated update of .build_number to 91 for branch master
Last update: 14eadea2c2 (4 commits ago)
2011-04-22 11:43:13 -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
Automatic Build Number Updater
55da59c942 Automated update of .build_number to 90 for branch master
Last update: 463014d336 (11 commits ago)
2011-04-22 09:30:33 -07:00
Bharat Mediratta
4e95804854 Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 09:30:09 -07: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
Automatic Build Number Updater
d4354c927d Automated update of .build_number to 89 for branch master
Last update: 463014d336 (9 commits ago)
2011-04-22 09:29:23 -07:00
Bharat Mediratta
84e4cba00b Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 09:28:24 -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
Automatic Build Number Updater
e1f6c7c816 Automated update of .build_number to 88 for branch master
Last update: 463014d336 (7 commits ago)
2011-04-22 08:12:51 -07:00
Bharat Mediratta
1d9afcf441 Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 08:12:01 -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
Automatic Build Number Updater
7102c26f80 Automated update of .build_number to 87 for branch master
Last update: 463014d336 (4 commits ago)
2011-04-21 15:51:25 -07:00
Bharat Mediratta
b385d458b0 Merge branch 'master' of github.com:gallery/gallery3 2011-04-21 15:50:59 -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
Automatic Build Number Updater
9aa1d9d579 Automated update of .build_number to 86 for branch master
Last update: 463014d336 (2 commits ago)
2011-04-21 15:44:43 -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
Automatic Build Number Updater
463014d336 Automated update of .build_number to 85 for branch master
Last update: 14eadea2c2 (3 commits ago)
2011-04-21 14:02:13 -07:00
Bharat Mediratta
29450bdd41 Merge branch 'master' of github.com:gallery/gallery3 2011-04-21 14:01:46 -07:00
Chris Kelly
1af4f99108 Add missing CSS tag so tables get aligned. Fixes #1678. 2011-04-21 14:01:02 -07:00
Automatic Build Number Updater
69cefb14ff Automated update of .build_number to 84 for branch master
Last update: 14eadea2c2 (1 commits ago)
2011-04-21 14:00:31 -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
Automatic Build Number Updater
14eadea2c2 Automated update of .build_number to 83 for branch master
Last update: 717d580b43 (1 commits ago)
2011-04-10 13:48:27 -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
Automatic Build Number Updater
717d580b43 Automated update of .build_number to 82 for branch master
Last update: 527e651cda (1 commits ago)
2011-04-04 17:46:10 -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
Automatic Build Number Updater
527e651cda Automated update of .build_number to 81 for branch master
Last update: e89b0b867c (1 commits ago)
2011-04-04 17:38:15 -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
Automatic Build Number Updater
e89b0b867c Automated update of .build_number to 80 for branch master
Last update: f6c5cec145 (1 commits ago)
2011-04-02 16:20:58 -07:00