Commit Graph

2109 Commits

Author SHA1 Message Date
Tim Almdal
faee4391a3 Remove a commented line I forgot to take out 2009-09-23 07:12:17 -07:00
Bharat Mediratta
91c99c9627 Simplify the "unchanged" status message. 2009-09-22 20:36:12 -07:00
Tim Almdal
28060d9dce Create a gallery error handler that traps php errors and rethrows them as Exceptions. This fixes ticket #763 2009-09-22 14:25:52 -07:00
Tim Almdal
1dc3f375bf Updated to Exifer r4477. Fixes ticket #763. 2009-09-22 12:35:40 -07:00
Tim Almdal
1e7a2f5808 Implement the updated version of gallery3-vendor/exifer which has gettext replaced with calls to the gallery t method to provide translation. Fixes ticket 672. 2009-09-22 11:09:04 -07:00
Tim Almdal
bec620487a Wrap the login form with a view in order to include a forgot password link. Fixes ticket #620 2009-09-22 09:48:24 -07:00
Tim Almdal
f1366d275e Issue an information message if the user clicks "Save Settings" indicating that the key was not changed as it as identical. This addresses the obscure issue raised in ticket #756 2009-09-22 08:46:07 -07:00
Tim Almdal
b310fab1f8 Change the link on the "Be first to comment" link to do a request to the server to get the comment add form. Fixes ticket #699. 2009-09-22 07:59:26 -07:00
Tim Almdal
bf93473de5 Revert "Change the exif module to respond to the gallery_ready event and check to see if gettext is installed. The 3rd party library used in the exif module expects gettext to be available. Rather than doing all the time use the gallery ready event to only do it when it might be needed. Fixes ticket #672"
This reverts commit 33690a32bc.
2009-09-22 06:56:28 -07:00
Bharat Mediratta
e5a78d39ec Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/controllers/albums.php
2009-09-21 21:29:13 -07:00
Bharat Mediratta
529ded3388 2nd attempt at gracefully dealing with sort columns that contain
nulls.  This time around, do a query to determine whether or not the
sort column has nulls in it.  If it doesn't, then use our comparators
as before.

There are NULLs in the sort column, so we can't use MySQL comparators.
Fall back to iterating over every child row to get to the current one.
This can be wildly inefficient for really large albums, but it should
be a rare case that the user is sorting an album with null values in
the sort column.

Fixes #627
2009-09-21 21:28:00 -07:00
Bharat Mediratta
123afc9542 Set children_count to 0, photos have no children. 2009-09-21 21:22:07 -07:00
Bharat Mediratta
88350c5b88 Update the next/previous item calculations to match what we do in photos.php
Force the children_count to be zero, movies have no children.
Rename $photo to $movie everywhere.
2009-09-21 21:21:52 -07:00
Bharat Mediratta
9e6be40e31 Add viewable() protection to children() and children_count() calls.
This is not currently necessary (nor is it a security hole) because we
don't constrain permissions at the child level in the core, but it
makes our security audits easier and will enable the scenario where
somebody writes a module to add per-photo permissions.
2009-09-21 20:47:55 -07:00
Tim Almdal
33690a32bc Change the exif module to respond to the gallery_ready event and check to see if gettext is installed. The 3rd party library used in the exif module expects gettext to be available. Rather than doing all the time use the gallery ready event to only do it when it might be needed. Fixes ticket #672 2009-09-21 13:33:45 -07:00
Bharat Mediratta
a6581ede0b Fix Item_Model::get_position() so that our sort is stable when the comparison
row has a null value in the sort field.  Fix for #627

Note: this changes get_position() to take an Item_Model instead of an id!
2009-09-21 11:35:27 -07:00
Tim Almdal
09f998e7a5 On the edit album form, add dirname and slug asa hidden fields, so that when the edits are being validated on input, the fields are found and can be referenced 2009-09-19 10:51:27 -07:00
Tim Almdal
cf89015a29 Change the fix for ticket #775 to always add the Add menu, but not add any items if the album directory is not writable. 2009-09-19 09:34:27 -07:00
Tim Almdal
4e6f2f1b4c Don't display the add menu if the underlying operating system directory is not writable. THis should fix ticket #775 2009-09-18 23:53:48 -07:00
Tim Almdal
be84c7be25 * Changed the close functionality so the page is reloaded when the dialog is closed.
* Renamed the ServerAddCloseButton.
* Added Pause and Continue buttons. Now when add is clicked, A Pause button is shown,
  once the adding is complete, the add button is reshown andpause button is hidden.
  Clicking the pause button will hide it and show a continue button.
2009-09-18 12:17:58 -07:00
Tim Almdal
15c3f0b1aa Refactor the server add javascript into a ui.gallery_server_add widget. 2009-09-17 21:26:55 -07:00
Andy Staudacher
2e23ae98c4 - Add theme->movie_menu() to whitelisted methods.
- xss_data checkpoint
2009-09-17 14:12:43 -07:00
Andy Staudacher
d050f0a246 Minor style fix: (string) $var, not (string)$var, and move the explicit cast down where it's needed. 2009-09-17 14:04:13 -07:00
Tim Almdal
2eeacd2656 use an implicit cast to convert the translated error message to a string as it is encoded by the json routines and will be treated as an object otherwise 2009-09-17 13:55:11 -07:00
Tim Almdal
6458b47e3e Remove the update code introduced with 9d7d79. In addition, captialize MyISAM correctly. 2009-09-17 12:38:59 -07:00
Tim Almdal
48326ad017 Cleanup issues with the original fix for #779 2009-09-17 12:11:00 -07:00
Tim Almdal
6469763225 Reload the album when server_add dialog is closed 2009-09-17 11:10:15 -07:00
Tim Almdal
c7f8d8be6f Don't try to creat an album that corresponds to the staging directory. Just add the contents of the staging directlyinto the album that server_add was invoked from. Fixes ticket #785 2009-09-17 10:57:22 -07:00
Tim Almdal
599d6377e8 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-17 10:56:07 -07:00
Tim Almdal
be1d49d017 Change the timeout on resubmitting the next task iteration to 25ms instead of. This allows the jQuery.ajax method to complete its processing. Otherwise, the browser can spend time thrashing around trying to send the next request. 2009-09-17 10:55:50 -07:00
Andy Staudacher
7c8e904388 Merge commit 'upstream/master' 2009-09-17 10:02:59 -07:00
Andy Staudacher
88c374dee8 Arg, fixing the "Sharing your Translations" text, thanks engineer@gmc 2009-09-17 10:01:15 -07:00
Tim Almdal
a5af531fbe Don't show links as part of the auto complete list 2009-09-17 07:04:11 -07:00
Andy Staudacher
30b5c389e6 Fix: Make "Sharing your translations" a localizable string 2009-09-17 01:21:06 -07:00
Andy Staudacher
86996dcac7 Mark permission's display name for translation 2009-09-17 01:17:30 -07:00
Tim Almdal
74d9d0901f Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-16 22:24:15 -07:00
Tim Almdal
9d76797b17 Changed the search module installer to explicitly specify MyISAM as the database type. Changed the packager to not remove the engine specification if the table is search_records. Fixes Ticket #774 2009-09-16 22:23:32 -07:00
Bharat Mediratta
e94eaa6b88 Merge branch 'master' of git@github.com:gallery/gallery3 2009-09-16 20:37:06 -07:00
Bharat Mediratta
4e1e24ba1a Add a movie_menu() theme callback, and have the default theme call it
in the sidebar on movie page types.
2009-09-16 20:34:42 -07:00
Tim Almdal
5490057480 When editing tags in place, and there is a validation error, highlight the tag with a red border and show a statust message. This fixes ticket: #779 2009-09-16 12:27:13 -07:00
Andy Staudacher
f1887422f8 Stricter input handling (cast to int) 2009-09-15 23:07:41 -07:00
Andy Staudacher
39632c4689 Also check for rss feeds in controller auth check 2009-09-15 23:01:26 -07:00
Andy Staudacher
7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Andy Staudacher
7ba93e2645 Merge commit 'upstream/master' 2009-09-15 22:05:02 -07:00
Andy Staudacher
dc3d45e760 Add exception for REST controllers (no fixes necessary). 2009-09-15 22:01:59 -07:00
Andy Staudacher
e168e0dfae CSRF / auth fixes, golden data file checkpoint 2009-09-15 21:50:48 -07:00
Andy Staudacher
61bbe1d78c First functional version of Controller_Auth_Test 2009-09-15 21:03:23 -07:00
Andy Staudacher
17254799d1 Initial skeleton of Controller_Auth code audit test (non functional). 2009-09-15 20:27:04 -07:00
Bharat Mediratta
c3f8b62376 Adjust the text of the symlink error message. 2009-09-15 19:57:12 -07:00
Jan Koprowski
7cc37451f4 Forbid from add symbolink link in admin server add. Read ticket #744 for more details. 2009-09-15 19:55:16 -07:00