Commit Graph

4686 Commits

Author SHA1 Message Date
shadlaws
ff6688b48b #1919 - change convert -v to convert -version 2013-01-01 15:47:04 +01:00
shadlaws
8300c867a1 #1931, #1932, #1933, #1934 - movieplayer view and movie_img function in items model
Many changes to movieplayer view and movie_img function in items model:
- include control bar height when dimensioning movie player
- provide a default "guess" at height and width when they are set as zero in items table
- resize movie player once the video is loaded based on its actual metadata
- add get_movie_img event to provide flexibility for altering/replacing the default Flowplayer v3

--HG--
extra : rebase_source : 5d1e9bb66ebf3e3fed5e1b9ee63790a204f21450
2012-12-30 10:03:36 +01:00
Bharat Mediratta
58ced4d25d Merge pull request #74 from mikemayer67/master
Correction of event sent from Users_Controller::_get_change_email_form

Fixes #1930
2012-12-20 15:37:37 -08:00
Bharat Mediratta
7910084224 Check for "add" instead of "edit" in item_rest::post. Fixes #1929. 2012-12-18 13:56:28 -08:00
shadlaws
ce68177ba0 [#1928 - Make thumbnail generation more flexible for movies (graphics and movie helpers)]
- graphics helper: add movie_extract_frame event to generate function
(allows modules to add to the options sent to movie::extract_frame or to
generate the thumbnail on their own without movie::extract_frame)
- movie helper: add extra optional argument to movie::extract_frame
(can add ffmpeg arguments and/or change the frame extract time)
- gallery_installer: add movie_extract_time module variable, update to v53
- module.info: update to v53
- install.sql: update to v53
2012-12-18 15:58:13 +01:00
Bharat Mediratta
7567f0395a Minor whitespace fix. 2012-12-17 08:13:39 -08:00
shadlaws
768e6fae09 Merge builds 261 and 262 from origin. 2012-12-16 18:56:54 +01:00
shadlaws
94b26e506c [#1924, #1925, #1927 - enhance compatibility with movies (movie helper) and file types (legal_file helper)]
bug fix: modify movie.php helper to take DAR (display aspect ratio) into account in get_file_metadata
bug fix / enhancement: add duration to get_file_metadata output
bug fix: modify movie.php helper to use correct resolution and duration from get_file_metadata in extract_frame
bug fix: modify movie.php helper to be more robust against ffmpeg failures and limitations, including adding "-threads 1" argument if needed
enhancement: modified to include ordered maps of extensions to MIME types (get_photo_types_by_extension and get_movie_types_by_extension functions), modified get_file_metadata in movie and photo helpers to use them
gallery_installer, module.info, install.sql: updated to v52 with m4v mime correction code (was video/mp4)
2012-12-16 18:11:01 +01:00
Chris Chilvers
f5420b4eab fix, use $current->score 2012-12-14 17:34:33 +00:00
Chris Chilvers
a529a55e0b search within the current album by default
When searching, limit search results to the current album.
In the search results screen, display which album was searched and provide
a link to search the whole gallery.
2012-12-14 17:34:26 +00:00
shadlaws
549630219f bug fix: updated file_proxy.php to use legal_file helper instead of hard-coded list of movie file extensions.
bug fix: updated uploader.php to use legal_file helper instead of hard-coded list of movie file extensions.

Fixes #1926
2012-12-10 11:15:02 -08:00
Bharat Mediratta
a74e3aea6f Eliminate the search context if we encounter an item that cannot be
found in the search results.  Fixes #1923.
2012-12-09 20:26:16 -08:00
chalbertgit
ce9199a955 [#1907] Added code needed for the case when a user upgrades. 2012-11-13 13:17:45 -05:00
chalbertgit
b507681427 [#1907] Added administrative variable to set lock timeout. 2012-11-13 11:51:03 -05:00
Michael A Mayer
05bd83220e Fixed event sent from User_Controller::_get_change_email_form
incorrect event: user_change_password_form
   corrected event: user_change_email_form
2012-10-25 01:04:06 -04:00
Bharat Mediratta
10c2ea408b Merge pull request #73 from epeay/master
[#1875] Active area of upload photo button less than 40% of text area only - not button
2012-10-08 14:51:15 -07:00
Bharat Mediratta
e81bb34327 Fix the delete function on item_tags and tag_items collections to
remove all tags from an item, or remove all items from a tag as
appropriate (ie, empty the collection).  Fixes #1902.
2012-10-08 14:45:10 -07:00
Bharat Mediratta
b7e89613fc Installer for comment module version 6 still set rss_visible to "both"
not "all".  Fix that now and rebuild the installer package.  Fixes #1917.
2012-10-08 14:04:40 -07:00
Bharat Mediratta
8855847df2 Fix the recaptcha signup url. Fixes #1888. 2012-10-08 13:50:33 -07:00
epeay
d8dce1e3e5 Updated Select Photos button hitbox to cover full visible button area. 2012-10-08 16:41:02 -04:00
Bharat Mediratta
71a67ebb9f Add locale for Thai. Fixes #1916. 2012-09-28 11:44:46 -07:00
Gerhard Schlager
a62e1aaf9d the HTTP header Cache-Control must contain "public" in order to allow caching of resources when HTTPS is used 2012-08-11 18:09:03 +02:00
Bharat Mediratta
71e33d9cb6 Fix up per item feed urls. Fixes #1906. 2012-08-02 12:58:28 -07:00
Bharat Mediratta
0875844784 Update Flowplayer to 3.2.12 along with all associated files. Also
switch over to the byte-range version of pseudostreaming, let's see if
that works better than what we have currently.  Fixes #1899.
2012-07-23 13:38:59 -07:00
Bharat Mediratta
a98f7577ba Avoid chaining after .gallery_autocomplete() - there are reports that
it doesn't work with later versions of jQuery.  Fixes #1889.
2012-07-21 16:16:36 -07:00
Bharat Mediratta
8524fba15a Sanitize the module name and don't allow storing values for illegal
module names.  Fixes #1898.
2012-07-21 15:42:52 -07:00
Bharat Mediratta
467a032f8e Rename any files that have two dots in them to a legal name. This
fixes the bug where we made those files invalid in 3.0.4 without
providing a clean upgrade path.  Bump gallery module to 50. Fixes
2012-07-21 15:11:27 -07:00
Bharat Mediratta
6d9d6a2e5d Allow albums to have two (or more) dots in the name. Fixes #1897. 2012-07-21 15:01:31 -07:00
Bharat Mediratta
a98afdb32c Refill the path and url caches in the item model at the end of this task. Fixes #1896. 2012-07-21 11:12:51 -07:00
Bharat Mediratta
3e99c37c35 Fix comment typo. 2012-07-21 11:11:16 -07:00
Bharat Mediratta
f9e77c4c14 Fix the access_cache rebuilding code to not load all missing access caches into the stack, if you're missing
enough it'll blow the stack (like, if you truncate the access_caches table).  Fixes #1895.
2012-07-21 10:38:23 -07:00
Bharat Mediratta
e4daa42830 Rename the comparator to something that makes more sense (to me), and make it static.
Follow-on to 5d9e717417 for #1859.
2012-06-11 14:02:23 -07:00
Bharat Mediratta
8e74750dc2 Checkpoint XSS golden file 2012-06-11 13:54:33 -07:00
Bharat Mediratta
37a0e9a710 Follow-on to 3caf3cc323 for #1866 - harden one
more place and update the test.
2012-06-11 13:47:00 -07:00
Bharat Mediratta
edb17db8cf Added access check - not really necesssary because we're only doing a
redirect, but it's nice to be consistent.  Follow-on for #1837.
2012-06-11 12:47:44 -07:00
Bharat Mediratta
03d55d2530 Encode urls in 404 log entries. Fixes #1882. 2012-06-05 21:25:56 -07:00
Bharat Mediratta
b416d7e3d5 Follow on to a9be0691d9 for #1872. 2012-06-05 21:15:21 -07:00
Bharat Mediratta
b7074ee595 Clean file paths in Kohana_Exception::debug_path(). Fixes #1880. 2012-06-05 21:13:34 -07:00
Bharat Mediratta
713a06f234 Do a better job of escaping filenames when uploading. Fixes #1881. 2012-06-05 20:20:21 -07:00
Bharat Mediratta
9e1f975e7b Fix up syntax in the last change. Follow-on for #1879. 2012-06-05 14:08:15 -07:00
Bharat Mediratta
a8034fe7b3 Merge pull request #68 from ffchung/patch-3
Force Turn off the compress as most image file already compressed.

Preliminary change for #1879 - more coming.
2012-06-05 14:05:40 -07:00
Bharat Mediratta
44d5f22d8d Remove <h2> added in last commit, it's unclear why that's necessary. The last commit had
the wrong ticket #, this actually resolves 1878.
2012-06-05 13:57:45 -07:00
Bharat Mediratta
3e7133c970 Merge pull request #70 from ffchung/patch-5
Show "Movie info" on movie page.  Fixes #1877.
2012-06-05 13:52:26 -07:00
Tony Fung
3286271376 Show "Movie info" on movie page 2012-06-05 11:24:13 +08:00
Tony Fung
3fd5f4cc87 CSS Style Update to match with other view 2012-06-05 11:20:31 +08:00
Tony Fung
6fbea19b35 Force Turn off the compress as most image file already compressed. 2012-06-05 11:16:37 +08:00
Bharat Mediratta
3fbe07078f Second attempt to fix #1821 - first attempt caused an infinite loop in some cases
when zlib.output_compression is enabled.
2012-06-04 19:54:01 -07:00
Bharat Mediratta
648d9a4de8 Remove accidental double encoding. 2012-05-19 11:51:10 -07:00
Bharat Mediratta
a9be0691d9 Create an ajax response framework that inserts <meta> tags to guard
against UTF-7, and create a $.gallery_autocomplete variant of jQuery's
autocomplete that expects the first line to be a <meta> tag and
discards it.  More complete fix for #1871.
2012-05-19 11:31:25 -07:00
Bharat Mediratta
74fa9422db Revert "Prevent server_add autocomplete from being interpreted as UTF-7. Fixes #1871."
This only fixes server_add, we need to fix it more systemically.

This reverts commit 88c0363344.
2012-05-19 11:31:25 -07:00