stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-27 18:24:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,979 Commits 4 Branches 0 Tags
af3d5acbcd5df6da8e532a009d5be6ba6d1cca0d
Commit Graph
3874 Commits
Author SHA1 Message Date
Bharat Mediratta af3d5acbcd Merge branch 'master' of github.com:gallery/gallery3 2010-09-01 22:00:40 -07:00
Bharat Mediratta 80e9fcaf47 Don't use $.remove() to get rid of items from the uploadify queue; 
that breaks uploadify and causes it to be unable to upload any new
items.  Fixes ticket #1324.
 2010-09-01 22:00:26 -07:00
Tim Almdal 1f621d9827 Refine the patch for #1216. If the admin user changes their email address update the sendmail from and reply_to fields in advanced settings. Also change this if the identity provider has changed. 2010-09-01 21:24:41 -07:00
Bharat Mediratta 78c590ebae Don't use HTTP_HOST to get the hostname. We force that to 
"example.com" when we are using the CLI so we'll get inconsistent
behavior between CLI and the web interface.

For now hardcode it to be example.com so that it's clear.  But to do
it right we need an after_install step which actually fixes it up.
And probably an after_upgrade step as well.
 2010-08-31 21:07:43 -07:00
Tim Almdal f80aff7434 Merge branch 'master' of git@github.com:gallery/gallery3 2010-08-31 20:46:49 -07:00
Tim Almdal e09c6dbd5e Patch for ticket #1216. Move the values that were in the sendmail config file and store them as gallery module variables. Requires a version number bump to 37. 2010-08-31 20:45:09 -07:00
Tim Almdal 438cea231d Clean up the default case in the OrganizeProperties::getProperty method 2010-08-31 20:40:48 -07:00
mamouneyyaandBharat Mediratta 318a94a5ef flip the float value for RTL 2010-09-01 10:59:00 +08:00
Bharat Mediratta 23d59dec72 Merge branch 'master' of github.com:gallery/gallery3 2010-08-31 00:06:32 -07:00
Bharat Mediratta db769b76ab Expire completed uploads and introduce a text message that says how 
many photos have been uploaded successfully.  This is to pave the way
for retry code later on.
 2010-08-31 00:03:46 -07:00
Tim Almdal 7819cc1723 Merge branch 'master' of git@github.com:gallery/gallery3 2010-08-30 22:43:42 -07:00
Tim Almdal 9bc84b6986 Clean up the default case in the OrganizeProperties::getProperty method 2010-08-30 22:43:25 -07:00
Bharat Mediratta 5568ab24de Normalize the "flash missing" message string with the one in the 
uploader for convenient localization.
 2010-08-30 22:21:00 -07:00
Bharat Mediratta c85b20d6ab Merge branch 'master' of github.com:gallery/gallery3 2010-08-30 22:20:43 -07:00
Bharat Mediratta 953d63555c Detect Flash and put up a reasonable message if your browser doesn't 
have Flash installed.  Fixes ticket #1268.
 2010-08-30 22:19:57 -07:00
Tim Almdal 866f8eefc6 Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item. 2010-08-30 22:06:26 -07:00
Tim Almdal 0f2daf29ac Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item. 2010-08-30 22:05:01 -07:00
Bharat Mediratta bc0d5e79cb Revert "Change the theme option page to display using tabs if the site theme has an admin page." 
This reverts commit d66c496fb1.

Conflicts:

	modules/gallery/helpers/theme.php
	modules/gallery/views/admin_theme_options.html.php
	themes/admin_wind/css/screen.css
 2010-08-29 23:09:52 -07:00
Bharat Mediratta 3707d4e94f Properly identify the base G2 url when G2 isn't using the rewrite 
module.  Fixes ticket #1322.
 2010-08-29 21:50:25 -07:00
Bharat Mediratta e881693798 Remember which comments we imported and don't import them a second 
time.  Fixes ticket #1282.
 2010-08-29 21:29:40 -07:00
Bharat Mediratta fcd4f77bb4 Reformat comment. 2010-08-29 21:26:25 -07:00
Bharat Mediratta ab598b2931 Put the theme CSS at the end of the module CSS so that the theme has 
the final say.  Fixes ticket #1315.
 2010-08-29 21:15:58 -07:00
Bharat Mediratta 2c717b18d3 Don't concatenate two strings together as an argument for t() or t2(); 
the l10n_scanner cannot parse it properly and drops those from the
localization list.  Fixes ticket #1284.
 2010-08-29 20:04:02 -07:00
Bharat Mediratta 0879a26e1c Put a message in the logs when we find a string that's not 
concatenated.  Concatenating them is not easy because the two strings
can have different quoting (single vs. double quotes) and may have to
be treated separately in the code.

Fixes ticket #1321
 2010-08-29 19:55:21 -07:00
Bharat Mediratta 2018831015 1) Rename "Cancel All" -> "Cancel uploads" to clarify what we're 
talking about and follow our capitalization standards.
2) Grey out the Done button when uploads are in progress.
Fixes ticket #1302.
 2010-08-29 16:39:01 -07:00
Bharat Mediratta 4c8445852d Bump gallery module to v36 and add a favicon_url variable, which we 
expose in Admin > Appearance > Theme Options and defaults to
lib/images/favicon.ico.

Thix fixes ticket #1312.
 2010-08-29 16:27:32 -07:00
Bharat Mediratta 24b511b44a Move theme::get_edit_form_admin into admin_theme_options since that's 
the only place where it's used and the theme helper is loaded on every
page view.
 2010-08-29 16:03:09 -07:00
Bharat Mediratta de93507d13 Regenerated version from http://github.com/gallery/gallery3-flex/commit/1e42ddf6574d7632474b8cfbd5b9171a9bb53552 
which contains fixes for both #1174 and #1305.
 2010-08-29 12:10:20 -07:00
Bharat Mediratta a184142d6f Revert "Update the Organize flash object with the fixes for ticket #1174." 
This commit reintroduces the bug in https://sourceforge.net/apps/trac/gallery/ticket/1305

This reverts commit efa1fce9de.
 2010-08-29 11:56:21 -07:00
Bharat Mediratta a9bfe6d322 Merge branch 'master' of github.com:gallery/gallery3 2010-08-29 11:47:33 -07:00
Bharat Mediratta 6a13a238bb Convert the "parents" variable from a result iterator to an array so 
that the theme can call empty() on it.  Fixes #1318.
 2010-08-29 11:45:27 -07:00
Tim Almdal efa1fce9de Update the Organize flash object with the fixes for ticket #1174. 2010-08-29 10:28:50 -07:00
Bharat Mediratta a08cd0db4e Add a "visible_title_length" variable that defaults to 15 and use that 
as the max title length when we do title truncation in the wind theme.
Bump the gallery module to 35.
 2010-08-28 21:58:28 -07:00
Bharat Mediratta 922b810c56 Oops, forgot to create an install() function and set the version of 
the organize module to 2 in 8fb56abf03
 2010-08-28 21:25:09 -07:00
Bharat Mediratta 7a5301ba05 Notifying on item_updated is overbroad. Fix for ticket #1286. 2010-08-25 10:09:14 -07:00
Bharat Mediratta 3ff91e5e33 Null out Item_Model::$data_file in Item_Model::save() when we're 
creating a new item, else the item_created event will trigger
subsequent saves which will think that they need to post an
item_updated_data_file event.  Partial fix for #1286
 2010-08-25 10:05:21 -07:00
Bharat Mediratta 545c069786 Delete old SWFupload code. We replaced it with uploadify ages ago. 2010-08-24 21:27:34 -07:00
Bharat Mediratta dc80cde379 Add "captcha_protect_form" event that the recaptcha module grabs and 
uses to add a captcha to the end of the first group in the form.  If
there are no groups, it adds the captcha at the end of the form.
Updated user_profile and comment forms to use it.
 2010-08-22 13:00:08 -07:00
Bharat Mediratta adc4061125 Use better error messages in form validation. 2010-08-22 12:49:01 -07:00
Bharat Mediratta 04add75f6f Get rid of the move dialog and move option. Instead, replace it with 
a call to Organize with the appropriate album open.  I have not yet
figured out how to get the SWF code to highlight the active image, but
that's coming.  Partial fix for #1204.
 2010-08-22 00:27:24 -07:00
Bharat Mediratta 91fab0fcf5 Compiled version of http://github.com/gallery/gallery3-flex/commit/88efbd77b45ae888b035295a8034229c645267c2 2010-08-22 00:26:52 -07:00
Bharat Mediratta 4d55166eba Fix a bug where we were using names in a string context resulting in 
sending the wrong custom headers back. Fixed the names of the headers
to be slightly more meta. Fixes #1305

Implemented in gallery3-flex bea5f67efa93a3921eec8cd03a15d68f513f1dc0
 2010-08-21 16:52:46 -07:00
Bharat Mediratta ae618840b6 Tighten up whitespace. 2010-08-21 15:25:06 -07:00
Bharat Mediratta c6a28a93dd Put up a warning and don't accept movie files if we don't have ffmpeg. 
This fixes ticket #973.
 2010-08-21 15:11:06 -07:00
Bharat Mediratta 4a01aaddc9 Verify that the ffmpeg path still exists by using file_exists(). This 
is a lightweight way to catch the case where ffmpeg gets deleted.
Fixes ticket #1303.
 2010-08-21 15:10:46 -07:00
Bharat Mediratta 7c1a716f01 Merge branch 'master' of github.com:gallery/gallery3 2010-08-21 14:06:51 -07:00
Bharat Mediratta 3e0b42573e Set the "secure" bit on cookies if we're using HTTPS. Fixes ticket #1217. 2010-08-21 14:06:30 -07:00
Tim AlmdalandBharat Mediratta 65801cf2e0 Fix a typo to the case correction. 2010-08-21 14:05:29 -07:00
Chad KiefferandBharat Mediratta 3fc08dfd4c Added text and submit classes to search form input and submit buttons, respectively. Fixed the width of the search form in IE. Button height's off in IE 8 compatbility mode. 2010-08-21 14:05:29 -07:00
Tim AlmdalandBharat Mediratta 33e76f5e33 Correct incorrect case on dialog title. 2010-08-21 14:05:29 -07:00