Commit Graph
6528 Commits
Author SHA1 Message Date
Bharat Mediratta cfa96d34e8 Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 06:50:58 -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
Automatic Build Number Updater ce14f5fb90 Automated update of .build_number to 99 for branch master
Last update: 5af74d4714 (10 commits ago)
2011-04-23 06:17:07 -07:00
Bharat Mediratta ea72cf15f0 Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 06:12:42 -07:00
Bharat Mediratta b8dcaf218b Merge branch 'master' of git://github.com/mamouneyya/gallery3 2011-04-23 06:12:32 -07:00
Automatic Build Number Updater 9e85562fa0 Automated update of .build_number to 98 for branch master
Last update: 5af74d4714 (8 commits ago)
2011-04-22 16:54:47 -07:00
Bharat Mediratta c6f1bc7d24 Merge branch 'master' of github.com:gallery/gallery3 2011-04-22 16:54:33 -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
Automatic Build Number Updater aedfe7246a Automated update of .build_number to 97 for branch master
Last update: 5af74d4714 (5 commits ago)
2011-04-22 16:40:15 -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
mamouneyya 3cee760701 remove a redundant declaration, and add rule for RTL 2011-04-23 01:33:03 +03: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