Chad Kieffer
bbb2a3a30c
Merge branch 'master' of git://github.com/gallery/gallery3
2011-04-23 23:26:40 -04:00
Chad Kieffer
342be9818f
Turn off bullets on the tag admin list.
2011-04-23 23:26:28 -04:00
Automatic Build Number Updater
4c7f27a1a6
Automated update of .build_number to 126 for branch master
...
Last update: 5d4d8a893b (1 commits ago)
2011-04-23 20:00:52 -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
Automatic Build Number Updater
5d4d8a893b
Automated update of .build_number to 125 for branch master
...
Last update: d835c06b5e (1 commits ago)
2011-04-23 16:12:29 -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
Automatic Build Number Updater
d835c06b5e
Automated update of .build_number to 124 for branch master
...
Last update: d3992b9983 (1 commits ago)
2011-04-23 15:36:39 -07:00
Bharat Mediratta
11a5e4d4b3
Merge branch 'master' of git://github.com/alindeman/gallery3
2011-04-23 15:36:26 -07:00
Automatic Build Number Updater
d3992b9983
Automated update of .build_number to 123 for branch master
...
Last update: c1779a9e8f (12 commits ago)
2011-04-23 15:19:16 -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
Automatic Build Number Updater
f45835e6e1
Automated update of .build_number to 122 for branch master
...
Last update: aa0d98e515 (1 commits ago)
2011-04-23 15:10:17 -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
Automatic Build Number Updater
aa0d98e515
Automated update of .build_number to 121 for branch master
...
Last update: c1779a9e8f (10 commits ago)
2011-04-23 15:01:51 -07:00
Bharat Mediratta
09be5e6fb8
Merge branch 'master' of github.com:gallery/gallery3
2011-04-23 14:53:50 -07:00
Bharat Mediratta
c07af35a19
Oops, fix broken codex urls. For #1698 .
2011-04-23 14:53:39 -07:00
Automatic Build Number Updater
ed21bbcb74
Automated update of .build_number to 120 for branch master
...
Last update: c1779a9e8f (8 commits ago)
2011-04-23 14:46:42 -07:00
Bharat Mediratta
176ac0508b
Merge branch 'master' of github.com:gallery/gallery3
2011-04-23 14:46:29 -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
Automatic Build Number Updater
7cbcab601f
Automated update of .build_number to 119 for branch master
...
Last update: c1779a9e8f (6 commits ago)
2011-04-23 14:45:32 -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
Automatic Build Number Updater
4f27df48da
Automated update of .build_number to 118 for branch master
...
Last update: f5a9abc26a (1 commits ago)
2011-04-23 13:56:57 -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
Andy Lindeman
6d9f2f835d
Correct path for fix-ie.css in admin_wind theme
...
* Fixes #1651
2011-04-23 16:44:23 -04:00
Automatic Build Number Updater
f5a9abc26a
Automated update of .build_number to 117 for branch master
...
Last update: c1779a9e8f (4 commits ago)
2011-04-23 13:29:33 -07:00
Bharat Mediratta
cab5f15c31
Merge branch 'master' of github.com:gallery/gallery3
2011-04-23 13:29:09 -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
Automatic Build Number Updater
1690d30916
Automated update of .build_number to 116 for branch master
...
Last update: c1779a9e8f (2 commits ago)
2011-04-23 13:22:15 -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
Automatic Build Number Updater
c1779a9e8f
Automated update of .build_number to 115 for branch master
...
Last update: 1da0551b3c (3 commits ago)
2011-04-23 13:11:37 -07:00
Bharat Mediratta
9362db66fe
Merge branch 'master' of github.com:gallery/gallery3
2011-04-23 13:11:31 -07:00
Bharat Mediratta
e241002008
Merge branch 'master' of git://github.com/ckieffer/gallery3 into chad
2011-04-23 13:11:01 -07:00
Automatic Build Number Updater
f8b2777fc7
Automated update of .build_number to 114 for branch master
...
Last update: 1da0551b3c (1 commits ago)
2011-04-23 13:05:57 -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
Automatic Build Number Updater
1da0551b3c
Automated update of .build_number to 113 for branch master
...
Last update: e0f4002c58 (1 commits ago)
2011-04-23 12:56:58 -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
Automatic Build Number Updater
e0f4002c58
Automated update of .build_number to 112 for branch master
...
Last update: dbdc3f0886 (1 commits ago)
2011-04-23 12:50:15 -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
Automatic Build Number Updater
dbdc3f0886
Automated update of .build_number to 111 for branch master
...
Last update: fb45d1a2ec (1 commits ago)
2011-04-23 12:27:50 -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
Automatic Build Number Updater
fb45d1a2ec
Automated update of .build_number to 110 for branch master
...
Last update: a9eb995dd2 (1 commits ago)
2011-04-23 12:16:39 -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
Chad Kieffer
268f9425d9
Merge branch 'master' of git://github.com/gallery/gallery3
2011-04-23 15:02:29 -04:00
Automatic Build Number Updater
a9eb995dd2
Automated update of .build_number to 109 for branch master
...
Last update: 7a4ff2fea1 (7 commits ago)
2011-04-23 10:09:27 -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