stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-29 11:10:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Staudacher 218493c50b Merge commit 'upstream/master' 2009-09-21 18:36:41 -07:00
Tim Almdal dd31b1d39f Revert "* Move the captured field into the exif module where it is created and populated." 
This reverts commit a00619b812.
 2009-09-21 13:56:52 -07:00
Tim Almdal ed6dfbc0e8 Revert "If captured had been used for any sort orders, reset back to weight" 
This reverts commit c01e467466.
 2009-09-21 13:56:10 -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 c01e467466 If captured had been used for any sort orders, reset back to weight 2009-09-21 09:11:31 -07:00
Tim Almdal 76a9e5b40f Merge branch 'master' into talmdal_dev 2009-09-20 21:05:51 -07:00
Tim Almdal a00619b812 * Move the captured field into the exif module where it is created and populated. 
* Create a new API event get_sort_fields that allows modules to contribute new sort fields that they manage. the only condition is that the module needs to add it to the item table.
* Changed g2_import to call this api to get the allowable sort fields
* Changed album::get_edit_form to call this new api to get the available sort fields
Partial fix for ticket #627, as the Capture date is not available until the exif module is installed.
 2009-09-20 20:59:18 -07:00
Chad Kieffer 62863f5fea Address IE8 hover effect issues. Closes #666. 2009-09-19 18:55:49 -06:00
Andy Staudacher d92c5a8a84 XSS test checkpoint 2009-09-19 12:39:58 -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 4f4b2995ae Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-17 22:17:24 -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
Tim Almdal 33bb2d9177 Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-17 16:51:48 -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 191ce0245d Merge branch 'master' into talmdal_dev 2009-09-17 11:18:31 -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 86681eebf7 Move the check_environment into the installer helper and call it from the command line installer as well as the web installer. 2009-09-17 07:29:37 -07:00
Tim Almdal a5af531fbe Don't show links as part of the auto complete list 2009-09-17 07:04:11 -07:00
Tim Almdal 2ca2e5b6f4 Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-17 06:07:49 -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 b6306c7726 Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-16 19:53:07 -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
Tim Almdal eb8e23582f Update the jquery-ui.js with the patched version from vendor 2009-09-16 08:46:55 -07:00
Tim Almdal b8201a7112 Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev 2009-09-16 07:02:22 -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