stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-23 07:15:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,279 Commits 4 Branches 0 Tags
3b9eb29d89e1b1c1bb869ea1cc8ee8a7e7df280a
Commit Graph
7279 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta 3b9eb29d89 Merge pull request #143 from mikeage/g2_import 
Replace = with ==
 2013-02-13 13:55:27 -08:00
Mike Miller d3ca2617f2 Replace = with == 
This was my mistake; I didn't test it thoroughly. It results in all g2 mappings being broken!
 2013-02-13 23:11:32 +02:00
Automatic Build Number Updater 4fc5396516 Automated update of .build_number to 341 for branch master 
Last update: 9ed6735033 (1 commits ago)
 2013-02-12 10:25:10 -07:00
Bharat Mediratta 8a1133952e Merge pull request #134 from shadlaws/fix_2001 
#2001 - Make filename sanitizing more consistent.
 2013-02-12 09:24:37 -08:00
Automatic Build Number Updater 9ed6735033 Automated update of .build_number to 340 for branch master 
Last update: 0302e4ec0e (1 commits ago)
 2013-02-12 10:23:59 -07:00
Bharat Mediratta c02152c77c Merge pull request #123 from shadlaws/fix_1988 
#1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").
 2013-02-12 09:23:27 -08:00
Automatic Build Number Updater 0302e4ec0e Automated update of .build_number to 339 for branch master 
Last update: e109f0b511 (1 commits ago)
 2013-02-12 10:21:28 -07:00
Bharat Mediratta 93a7722318 Merge pull request #135 from shadlaws/fix_zend_debug_message 
#1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation is enabled.
 2013-02-12 09:21:05 -08:00
shadlaws b01897af8d #1749, #1754, #1901 - Add debugging message if Zend Guard code obfuscation is enabled. 
Zend Guard code obfuscation is enabled by default on many PHP 5.3+ installations,
but we don't use it and Kohana 2.4 is incompatible with it (see Trac tickets).
Rather than crash and/or hack core Kohana code, we can display an error message
to help the end user disable it.
 2013-02-12 11:26:43 +01:00
shadlaws d04a6fc87d #2001 - Make filename sanitizing more consistent. 
- legal_file - added sanitize_filname() to sanitize photo/movie filenames.
- admin_watermarks - revised add() to use new function.
- item model - added _process_data_file_info() to validate the data file, get its metadata, and sanitize the item name.
- item model - revised save() for new items to use _process_data_file_info *before* the slug is checked.
- item model - revised save() for updated items to use _process_data_file_info.
- item model - revised save() for updated items to sanitize name if changed.
- uploader - removed call to smash_extensions (item model does this when it calls sanitize_filename).
- Legal_File_Helper_Test - added unit tests for sanitize_filename.
- Item_Model_Test - revised existing unit tests based on changes.
- Item_Model_Test - added new unit tests for names with legal but incorrect extensions.
- Averted take over by HAL with fix #2001...
 2013-02-12 00:37:33 +01:00
shadlaws 0a2670a19a #1988 - Add movie_allow_uploads option ("always", "never", or "autodetect"). 
- gallery_installer, module.info, install.sql - add movie_allow_uploads variable
- movie::allow_uploads (new) - return true if movie_allow_uploads is "always" or "autodetect" and FFmpeg found, false otherwise
- legal_file - use movie::allow_uploads instead of movie::find_ffmpeg
- Form_Uploadify - use movie::allow_uploads instead of movie::find_ffmpeg
 2013-02-12 00:30:30 +01:00
Automatic Build Number Updater e109f0b511 Automated update of .build_number to 338 for branch master 
Last update: 53ce9c85d1 (1 commits ago)
 2013-02-10 22:51:22 -07:00
Bharat Mediratta 33149ef87a Merge pull request #121 from shadlaws/fix_1935_only 
#1935 - Make FFmpeg easier to install.
 2013-02-10 21:51:05 -08:00
Automatic Build Number Updater 53ce9c85d1 Automated update of .build_number to 337 for branch master 
Last update: 9c363abc41 (1 commits ago)
 2013-02-10 22:42:53 -07:00
Bharat Mediratta bb7590152d Merge pull request #132 from shadlaws/fix_2000 
#2000 - Make legal_file::smash_extensions more robust.
 2013-02-10 21:42:24 -08:00
Automatic Build Number Updater 9c363abc41 Automated update of .build_number to 336 for branch master 
Last update: a06faf61b4 (2 commits ago)
 2013-02-10 16:56:03 -07:00
shadlaws bfdf5a00fd #2000 - Make legal_file::smash_extensions more robust. 
- Fixed legal_file::smash_extensions.
- Added new unit test.
- Removed duplicated condition in existing unit test.
 2013-02-10 02:28:47 +01:00
Bharat Mediratta 9dbe2e15ad Extend siblings callbacks to take a $limit and an $offset for navigating 
large sibling sets.  Useful for the thumbnav module since we don't want to
iterate a thousand siblings to find the one we care about.  Fixes #1999.
 2013-02-09 14:53:34 -05:00
Bharat Mediratta 8c5d5525d0 Reset db_applied after find(). Fixes #1998. 2013-02-09 14:53:07 -05:00
shadlaws 1d7f5e3ab1 #1935 - Make FFmpeg easier to install. 
- system::find_binary - add Gallery's bin subdirectory to search
- system::find_binary - auto-fix permissions if found in Gallery's bin directory
 2013-02-09 20:48:02 +01:00
Automatic Build Number Updater a06faf61b4 Automated update of .build_number to 335 for branch master 
Last update: dce3126698 (1 commits ago)
 2013-02-09 11:36:48 -07:00
Bharat Mediratta 11e56b29da Merge pull request #130 from shadlaws/fix_1997 
#1997 - Correct movie dimensions and mime type improperly set by contributed modules.
 2013-02-09 10:36:42 -08:00
Automatic Build Number Updater dce3126698 Automated update of .build_number to 334 for branch master 
Last update: bc8cd154c5 (1 commits ago)
 2013-02-09 11:36:11 -07:00
Bharat Mediratta 2dc695c606 Merge pull request #129 from shadlaws/fix_1996 
#1996 - Add blacklist to legal_file helper.
 2013-02-09 10:36:03 -08:00
Automatic Build Number Updater bc8cd154c5 Automated update of .build_number to 333 for branch master 
Last update: f4ecb7e658 (1 commits ago)
 2013-02-09 11:35:34 -07:00
Bharat Mediratta 7613d886f9 Merge pull request #128 from shadlaws/fix_1994 
#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.
 2013-02-09 10:35:04 -08:00
shadlaws 8dcdb3b8e1 #1997 - Update movie dimensions and mime type if previously set without FFmpeg. 
- Added code to check/correct movie width, height, and mime in graphics::generate.
As the comment says in the commit, this isn't ideal, but doing it in an upgrade
script wouldn't be very ideal either.
 2013-02-09 18:12:08 +01:00
Automatic Build Number Updater f4ecb7e658 Automated update of .build_number to 332 for branch master 
Last update: 40c5cba2dc (1 commits ago)
 2013-02-08 21:19:58 -07:00
Bharat Mediratta e4f206c6ae Merge pull request #127 from shadlaws/fix_1993 
#1993 - Remove "failed" query string from upgrader redirect if there are no errors.
 2013-02-08 20:19:54 -08:00
shadlaws 942233dd26 #1996 - Add blacklist to legal_file helper. 
Adding a blacklist to legal_file could prevent possible security holes arising
from a contributed module that adds file types by user input (e.g. an admin screen).
 2013-02-08 15:21:57 +01:00
shadlaws 0312d1b071 #1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal. 
- photo & movie helpers: modified to throw exceptions when file is known to be unidentifiable/illegal.
- item model: revised to work with exceptions and be more explicit when the data file is invalid.
- item model: removed duplicate get_file_metadata call for updated items.
- admin_watermarks controller: revised to work with exceptions (really cleans up logic here).
- graphics helper: revised to handle invalid placeholders (a nearly-impossible corner case, but still...).
- photo & movie helper tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
- item model tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
 2013-02-08 13:51:41 +01:00
shadlaws 2dc97fab05 #1993 - Remove "failed" query string from upgrader redirect if there are no errors. 
- Changed redirect if it finished without failures.
- No change to Upgrader_Controller::index(), since its behavior with an empty vs. undefined failed query is identical.
 2013-02-08 09:03:57 +01:00
Automatic Build Number Updater 40c5cba2dc Automated update of .build_number to 331 for branch master 
Last update: 1796a290c1 (2 commits ago)
 2013-02-07 13:09:54 -07:00
Bharat Mediratta 59371077c2 Merge branch 'master' of github.com:gallery/gallery3 2013-02-07 15:09:15 -05:00
Bharat Mediratta 27ec3b4c6c Follow-on to 1e4d75c120 for #1975. 
Don't try to use an array index on a function return, that's not supported
in PHP 5.3
 2013-02-07 15:08:55 -05:00
Automatic Build Number Updater 0f7eecbf9b Automated update of .build_number to 330 for branch master 
Last update: 2fe80add2e (1 commits ago)
 2013-02-07 12:57:02 -07:00
Bharat Mediratta 530da82c5f Merge pull request #125 from shadlaws/fix_1992 
#1992 - Improve examples for thumb/resize/file path/url functions in item model
 2013-02-07 11:56:37 -08:00
shadlaws 2da4d9dd1f #1992 - Improve examples for thumb/resize/file path/url functions in item model. 
Documentation-only changes to examples used in:
- Item_Model::url
- Item_Model::abs_url
- Item_Model::file_path
- Item_Model::file_url
- Item_Model::resize_path
- Item_Model::resize_url
- Item_Model::thumb_path
- Item_Model::thumb_url
 2013-02-07 09:49:28 +01:00
Automatic Build Number Updater 2fe80add2e Automated update of .build_number to 329 for branch master 
Last update: aed006a92e (1 commits ago)
 2013-02-06 15:58:48 -07:00
Bharat Mediratta d9273038b0 Merge pull request #124 from shadlaws/fix_1991 
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type
 2013-02-06 14:58:25 -08:00
Automatic Build Number Updater aed006a92e Automated update of .build_number to 328 for branch master 
Last update: 1796a290c1 (1 commits ago)
 2013-02-06 15:57:04 -07:00
Bharat Mediratta 0c4912c542 Merge pull request #122 from shadlaws/followon_1982_part_2 
Follow-on to 949b8cda14 for #1982.
 2013-02-06 14:56:31 -08:00
shadlaws faa719551d #1991 - Add options to graphics::mark_dirty to specify type and/or mime type. 
- graphics::mark_dirty - added $type and $mime_type as options.
- graphics::mark_dirty - used options to set additional where conditions.
 2013-02-06 11:04:24 +01:00
shadlaws 1ae1165229 Follow-on to 949b8cda14 for #1982. 
- Add extra condition to Item_Model_Test::urls_test to test cache busters of missing files.
- Previous commit fixes unit test for empty album url, but now no test checks missing files.
 2013-02-06 10:24:06 +01:00
Automatic Build Number Updater 1796a290c1 Automated update of .build_number to 327 for branch master 
Last update: f9aeb3b5cd (5 commits ago)
 2013-02-05 11:03:07 -07:00
Bharat Mediratta 428d4f319b Merge branch 'master' of github.com:gallery/gallery3 2013-02-05 13:02:56 -05:00
Bharat Mediratta c4b2f79a67 Force a sort order no sibling checks. Fixes #1990. 2013-02-05 13:02:26 -05:00
Automatic Build Number Updater 8739e58348 Automated update of .build_number to 326 for branch master 
Last update: 291059d86a (1 commits ago)
 2013-02-03 10:45:10 -07:00
Bharat Mediratta 0d9c4da0ff Merge pull request #118 from shadlaws/fix_1982_followon 
Follow-on to f83ed5f871 for #1982.
 2013-02-03 09:44:51 -08:00
Automatic Build Number Updater 291059d86a Automated update of .build_number to 325 for branch master 
Last update: f9aeb3b5cd (3 commits ago)
 2013-02-02 21:42:14 -07:00