Commit Graph

7522 Commits

Author SHA1 Message Date
Automatic Build Number Updater
b7c73ee693 Automated update of .build_number to 304 for branch master
Last update: cf58e064d4 (1 commits ago)
2013-01-29 10:10:26 -07:00
Bharat Mediratta
2551b31b8f Merge pull request #106 from shadlaws/fix_1945
#1945 - Extend legal_file helper functions.
2013-01-29 09:10:06 -08:00
Automatic Build Number Updater
cf58e064d4 Automated update of .build_number to 303 for branch master
Last update: 23c6c50752 (1 commits ago)
2013-01-29 10:01:44 -07:00
Bharat Mediratta
3b0de7791b Merge pull request #107 from shadlaws/fix_1969
#1969 - Give graphics events the ability to override the standard process
2013-01-29 09:01:31 -08:00
shadlaws
5fca371a61 #1945 - Extend legal_file helper functions.
- Added get_types_by_extension function, which is a merged version of get...types_by_extension functions (similar to get_extensions).
- Added optional extension argument to get...extensions functions similar to get...types_by_extension functions.
- Added unit tests.  Now, every legal_file function has one.
- Restructured helper file to include caches.
- Added array_unique to get...types (derived from get...types_by_extension, which can be many-to-one).
- Edited server_add, uploader, and item model to use new functionality.
2013-01-28 23:31:18 +01:00
Automatic Build Number Updater
23c6c50752 Automated update of .build_number to 302 for branch master
Last update: daad29e5c3 (1 commits ago)
2013-01-28 10:47:35 -07:00
Bharat Mediratta
785633d910 Merge pull request #109 from shadlaws/fix_1971
#1971 - Make resequence_child_weights_test unit test more reliable.
2013-01-28 09:47:11 -08:00
shadlaws
1313a02bf4 #1971 - Make resequence_child_weights_test unit test more reliable.
- Set the sort_column of the parent album to id, which has no possibility of being identical between the two photos.
- Now, the reweighting will reverse the order even if they were created during the same second.
2013-01-28 14:47:26 +01:00
shadlaws
9e20a30d22 #1969 - Give graphics events the ability to override the standard process.
While graphics_rotate, graphics_resize, and graphics_composite events already exist, they don't have the ability to *override* the standard process.
This makes it a bit tricky when you want to replace the standard procedure with another (e.g. use jpegtran to perform lossless jpg rotation).
Solution:
- make a temp filename.
- tell the events to use it as the output file.
- if an event makes something, use it and skip the standard process.
2013-01-27 21:55:24 +01:00
Automatic Build Number Updater
daad29e5c3 Automated update of .build_number to 301 for branch master
Last update: 0c214d85e6 (1 commits ago)
2013-01-27 13:37:08 -07:00
Bharat Mediratta
e957c97c94 Add a key on relative_path_cache in the items table to improve performance on installs
that use File_Proxy heavily.  Fixes #1920.
2013-01-27 15:35:42 -05:00
Automatic Build Number Updater
0c214d85e6 Automated update of .build_number to 300 for branch master
Last update: c508fc4a45 (1 commits ago)
2013-01-26 12:01:04 -07:00
Bharat Mediratta
b06c0f4890 Merge pull request #104 from shadlaws/fix_1966
#1966 - "Fix your Gallery" shows 60/59 items completed.
2013-01-26 11:00:56 -08:00
Automatic Build Number Updater
c508fc4a45 Automated update of .build_number to 299 for branch master
Last update: 847a825b25 (1 commits ago)
2013-01-26 11:59:20 -07:00
Bharat Mediratta
6042bfd1f5 Merge pull request #91 from shadlaws/fix_1946_1947
#1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions
2013-01-26 10:59:18 -08:00
shadlaws
603db40459 #1966 - "Fix your Gallery" shows 60/59 items completed.
- Fixed counter in gallery_task::fix that was often one too many.

For FIX_STATE_RUN_MISSING_ACCESS_CACHES, changed this:
$stack = explode(" ", $task->get("stack"));
To this:
$stack = array_filter(explode(" ", $task->get("stack")));
2013-01-26 09:08:03 +01:00
shadlaws
cc2aed656c #1946, 1947 - Make altered names/slugs more user-friendly, make conflict-finding code check filenames with no extensions
- Reduced from four places that alter names/slugs to two (one to populate empty slugs, one to handle conflicting names/slugs).
- For empty slugs, fill with generic human-readable name (e.g. "photo") instead of random value.
- For conflicting names/slugs, add suffix that's sequential (e.g. "-01"), only using random after 99 conflicts.
- Made conflict-finding code check filenames with no extensions.
- Renamed _randomize_name_or_slug_on_conflict to _check_and_fix_conflicts.
- Added unit tests.  Also cleaned up existing unit tests to reflect new logic and removed a redundant test.
- Added installer logic to correct existing items now considered in conflict.
- Revised gallery_task to look for duplicate names based on new criteria.
2013-01-26 08:38:31 +01:00
Automatic Build Number Updater
847a825b25 Automated update of .build_number to 298 for branch master
Last update: 066f4cdf8e (1 commits ago)
2013-01-25 16:26:55 -07:00
Bharat Mediratta
96f4a5ea85 Merge pull request #103 from shadlaws/fix_1965
#1965 - Improve sanity checks and copy/convert/process logic for rotate and resize
2013-01-25 15:26:27 -08:00
Automatic Build Number Updater
066f4cdf8e Automated update of .build_number to 297 for branch master
Last update: 776fe75ceb (1 commits ago)
2013-01-25 16:25:39 -07:00
Bharat Mediratta
3fa7b66585 Merge pull request #96 from shadlaws/fix_1951
#1951 - Make metadata generation more flexible (photo and movie helpers).
2013-01-25 15:25:06 -08:00
shadlaws
212944e1ea #1951 - Make metadata generation more flexible (photo and movie helpers).
- added photo_get_file_metadata and movie_get_file_metadata events
- modified photo::get_file_metadata and movie::get_file_metadata to use them
- ensure that non-readable files throw exceptions
- redirected other photo metadata calls in core to photo::get_file_metadata (the helper function already exists, but in many places getimagesize is still called directly)
- added some unit tests (neither of the functions above had one)
2013-01-26 00:04:55 +01:00
shadlaws
c2d1c2407f #1965 - Improve sanity checks and copy/convert/process logic for rotate and resize.
- resize: ensured that resize is skipped *only* if the metadata is valid or the options are well-defined and would upscale. Then, if resize is skipped, check to see if it still needs to be converted. Previous conditions would allow a small PNG to get copied to a JPG, and would allow a corrupted JPG to be copied to the output.
- rotate: add checks for empty file or empty options.
- use get_file_metadata instead of direct getimagesize call.
- add unit tests for rotate and resize, including some for corrupted input files and missing options.
2013-01-25 23:47:08 +01:00
Automatic Build Number Updater
776fe75ceb Automated update of .build_number to 296 for branch master
Last update: 7e710366de (1 commits ago)
2013-01-25 13:49:32 -07:00
Bharat Mediratta
21a4341014 Fix an assignment-instead-of-comparison bug. I wish PHP had a better
warning system for this stuff.  In this case it's innocuous because
the UI only allows you to rearrange stuff inside a single album, so
the assignment doesn't do anything.  Fixes #1914.
2013-01-25 15:49:04 -05:00
Automatic Build Number Updater
7e710366de Automated update of .build_number to 295 for branch master
Last update: c71f3091d2 (1 commits ago)
2013-01-25 12:31:28 -07:00
Bharat Mediratta
5868fe0b86 Merge pull request #102 from shadlaws/fix_1964
#1964 - TMPPATH is mis-defined in index.php.
2013-01-25 11:31:07 -08:00
Automatic Build Number Updater
c71f3091d2 Automated update of .build_number to 294 for branch master
Last update: ba3b0c06b0 (1 commits ago)
2013-01-25 12:28:58 -07:00
Bharat Mediratta
cc91159bee Follow-on to 8e954cf5f0 - use HTTP_HOST if there's no SERVER_NAME 2013-01-25 14:28:24 -05:00
Automatic Build Number Updater
ba3b0c06b0 Automated update of .build_number to 293 for branch master
Last update: 0397497ba0 (2 commits ago)
2013-01-25 12:20:16 -07:00
Bharat Mediratta
8e954cf5f0 Use SERVER_NAME instead of HTTP_HOST. Fixes #1963. 2013-01-25 14:19:35 -05:00
Bharat Mediratta
7548266edf Properly escape backslashes. Fixes #1962. 2013-01-25 14:17:52 -05:00
Automatic Build Number Updater
0397497ba0 Automated update of .build_number to 292 for branch master
Last update: 4c1dc8457e (1 commits ago)
2013-01-25 10:10:03 -07:00
Bharat Mediratta
98e709220a Merge pull request #100 from shadlaws/fix_1956
#1956 - Escape LIKE queries (for _ and %).
2013-01-25 09:09:38 -08:00
shadlaws
f90cd11bcf #1964 - TMPPATH is mis-defined in index.php.
- fixed mis-definition of TMPPATH, which was resulting in something like .../gallery/var//tmp/
2013-01-25 13:36:27 +01:00
shadlaws
48bd19808c #1956 - Escape LIKE queries (for _ and %).
In MySQL queries, _ and % characters are treated as wildcards (similar to ? and *, respectively).
- Added escape_for_like function to MY_Database.php
- Added unit test to Database_Test
- Corrected the five unescaped instances in the code using this function.
2013-01-25 08:47:29 +01:00
Automatic Build Number Updater
4c1dc8457e Automated update of .build_number to 291 for branch master
Last update: 4926615cd0 (1 commits ago)
2013-01-24 21:49:24 -07:00
Bharat Mediratta
e8b7e155d5 Follow-on to b507681427 - add a default
value for lock_timeout so that folks who get the latest code but don't
run the upgrader don't get burned by a SQL error.
2013-01-24 23:48:07 -05:00
Automatic Build Number Updater
4926615cd0 Automated update of .build_number to 290 for branch master
Last update: 31807a59a5 (13 commits ago)
2013-01-24 16:16:01 -07:00
Bharat Mediratta
0353578630 Merge branch 'master' of github.com:gallery/gallery3 2013-01-24 18:14:28 -05:00
Bharat Mediratta
86a2759062 If profiling is enabled, dump out profiling data instead of proxied
images so that we can see how efficient our proxying is.  Follow-on
for #1959.
2013-01-24 18:14:14 -05:00
Bharat Mediratta
727a595447 Add back a comment that I accidentally removed in the last commit. 2013-01-24 18:13:26 -05:00
Automatic Build Number Updater
98d09c3740 Automated update of .build_number to 289 for branch master
Last update: c9a30e3b7e (1 commits ago)
2013-01-24 13:46:34 -07:00
Bharat Mediratta
6830ac4542 Merge pull request #99 from shadlaws/fix_1955
#1955 - Make unit test photos unique.
2013-01-24 12:46:26 -08:00
Automatic Build Number Updater
c9a30e3b7e Automated update of .build_number to 288 for branch master
Last update: 3e451d6edc (1 commits ago)
2013-01-24 13:40:45 -07:00
Bharat Mediratta
d8f99c258c Merge pull request #101 from shadlaws/fix_1960
#1960 - Add unit test to look for extra spaces at end of line
2013-01-24 12:40:32 -08:00
shadlaws
126727b4f2 #1955 - Make unit test photos unique.
- Added test::random_unique_photo and test::random_unique_photo_unsaved to uniquify test photos.
- Uniquified the black dot of test.jpg by coloring it with the six-digit hex code already used to name the random photos (e.g. "name_a48801.jpg").
- Modified four tests in Item_Model_Test that check photo file contents to use new functions to guarantee uniqueness.
2013-01-24 15:56:13 +01:00
shadlaws
031dd3bd6f #1960 - Add unit test to look for extra spaces at end of line
- Added no_extra_spaces_at_end_of_line_test to File_Structure_Test.
- Updated Gallery_Filters to exclude testing code that isn't ours.
- Removed existing extra spaces.  New test now passes.
2013-01-24 12:03:05 +01:00
Automatic Build Number Updater
3e451d6edc Automated update of .build_number to 287 for branch master
Last update: 31807a59a5 (10 commits ago)
2013-01-23 19:34:42 -07:00
Bharat Mediratta
da5fbd10c7 Merge branch 'master' of github.com:gallery/gallery3 2013-01-23 21:34:14 -05:00