Commit Graph

7522 Commits

Author SHA1 Message Date
Automatic Build Number Updater
c97fe4bcdd Automated update of .build_number to 349 for branch master
Last update: 5b6c138da1 (4 commits ago)
2013-02-15 17:10:08 -07:00
Bharat Mediratta
346c578f30 Merge branch 'master' of github.com:gallery/gallery3 2013-02-15 19:09:17 -05:00
Bharat Mediratta
7bdccade98 Every 500th request prune a single old file from var/tmp and var/logs.
Might not be aggressive enough.  Fixes #2005.
2013-02-15 19:09:06 -05:00
Bharat Mediratta
4523a3a49a Merge pull request #144 from shadlaws/jquery_dialogs
Jquery dialogs
2013-02-15 13:08:17 -08:00
shadlaws
7c5d9db61c Fixed formatting in gallery.dialog.js (no functional changes). 2013-02-15 19:32:01 +01:00
shadlaws
4dd7b708b2 Dialog sizing, titles, and z-index. This should ensure the small <500px dialogs
are correct, all titles are correctly sized, and the dialog boxes go to
the top for older themes, too.
2013-02-15 19:31:20 +01:00
Automatic Build Number Updater
016335fb89 Automated update of .build_number to 348 for branch master
Last update: 5b6c138da1 (2 commits ago)
2013-02-15 11:24:48 -07:00
Bharat Mediratta
1748aae9d1 Create an empty and secure gallery3/bin directory for use with the new
system::find_binary code.  Fixes #2004.
2013-02-15 13:23:39 -05:00
Bharat Mediratta
8b0088fd8d Change gallery/bin -> gallery3/bin in the comment since I suspect most
people don't change the name of the directory.  Follow-on to
1d7f5e3ab1 for #1935
2013-02-15 13:23:05 -05:00
Bharat Mediratta
96a01c86d9 Merge branch 'master' into jquery_190 2013-02-15 13:00:26 -05:00
Automatic Build Number Updater
5b6c138da1 Automated update of .build_number to 347 for branch master
Last update: 6089374891 (1 commits ago)
2013-02-15 10:58:25 -07:00
Bharat Mediratta
264e1e82b2 Digibug up and vanished. Move the module to contrib for now. This
will leave the module active in any existing installs that had it
active, but that shouldn't cause any negative impact.  Fixes #2002.
2013-02-15 12:57:42 -05:00
Automatic Build Number Updater
6089374891 Automated update of .build_number to 346 for branch master
Last update: 21acbbf549 (1 commits ago)
2013-02-14 18:40:48 -07:00
Bharat Mediratta
ea741a8457 Merge pull request #138 from shadlaws/fix_2003
#2003 - Add admin/movies screen.
2013-02-14 17:40:44 -08:00
shadlaws
f212f6a794 #2003 - Add admin/movies screen.
Added admin/movies screen analogous to the admin/graphics screen so the user can:
- see how FFmpeg is configured (path and version, similar to toolkits in admin/graphics)
- get some instructions on how to install FFmpeg if not found
- change the movie_allow_uploads setting
- ask Gallery to rebuild their movie thumbs
Specifics:
- admin_movies, admin_movies.html (new) - new Movies admin screen
- ffmpeg.png (new) - logo for admin screen
- movie::get_ffmpeg_version (new) - return version number and date of FFmpeg
- form_uploadify.html - change admin message if movie uploads are disabled
- gallery_event::admin_menu - added Movies link to Settings
- xss_data.txt - updated golden file for unit tests
2013-02-14 23:42:20 +01:00
Bharat Mediratta
16b8b8d16b Merge pull request #141 from shadlaws/jquery_19_dialog_sizing
Dialog centering, sizing, etc. seem to be fixed!
2013-02-14 11:45:43 -08:00
Bharat Mediratta
7ef7759947 Merge pull request #142 from shadlaws/jquery_19_themeroller
Updated Themeroller for wind and admin_wind.
2013-02-14 11:45:06 -08:00
Bharat Mediratta
c345bb7de5 Merge pull request #140 from shadlaws/jquery_19_libs_followon
Changing 2 library names back to (less-standardized) original names.
2013-02-14 11:44:19 -08:00
Automatic Build Number Updater
21acbbf549 Automated update of .build_number to 345 for branch master
Last update: 3fa08f54a6 (1 commits ago)
2013-02-14 12:44:08 -07:00
Bharat Mediratta
004fb588c6 Merge pull request #139 from shadlaws/followon_zend_guard_debug_message
Follow-on to b01897af8d - add debugging message
2013-02-14 11:43:44 -08:00
Automatic Build Number Updater
3fa08f54a6 Automated update of .build_number to 344 for branch master
Last update: db98101363 (1 commits ago)
2013-02-14 12:43:27 -07:00
Bharat Mediratta
72a6a8abaf Follow-on to 9dbe2e15ad for #1999.
Fix an issue where siblings() by itself throws an error.  The problem is that
Theme_View::siblings() passes a null offset and limit to the callback which
gets passed down to search::search_within_album, which creates its query
in raw SQL and doesn't check for a null offset/limit.  We want a reasonable
limit on the size of the set here (and 1000 is probably wayyy too high so
lower that to 100) so amend get_siblings to stop using default parameters
and actually check the inputs.

Author: Bharat Mediratta <bharat@menalto.com>
Date:   Sat Feb 9 14:53:34 2013 -0500

    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-14 14:43:03 -05:00
Automatic Build Number Updater
db98101363 Automated update of .build_number to 343 for branch master
Last update: e5ed05004f (1 commits ago)
2013-02-14 12:18:56 -07:00
Bharat Mediratta
6c861a014d Merge pull request #133 from shadlaws/followon_1994
Follow-on to 0312d1b071 for #1994.
2013-02-14 11:18:45 -08:00
Automatic Build Number Updater
e5ed05004f Automated update of .build_number to 342 for branch master
Last update: 4fc5396516 (1 commits ago)
2013-02-13 14:55:53 -07:00
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
shadlaws
f580488fb5 Fix Cancel link positioning, fix watermark error reply (seems to have already been broken in v3.0.4...) 2013-02-13 09:45:12 +01:00
shadlaws
761420bb06 Updated Themeroller for wind and admin_wind. 2013-02-13 08:36:15 +01:00
shadlaws
1ac2c959d0 Dialog centering, sizing, etc. seem to be fixed! Well, *if* they come from a link/menu.
If they come from a context menu, they're still really broken.
2013-02-13 00:31:43 +01:00
shadlaws
6395c518f0 Changing 2 library names back to (less-standardized) original names.
json2.js -> json2-min.js ; jquery.localScroll.js -> jquery.localscroll.js
While this is irrelevant for Wind, changing the filenames back to what we used
to have ensures that we don't break contributed themes.

--HG--
rename : lib/jquery.localScroll.js => lib/jquery.localscroll.js
2013-02-12 23:14:46 +01:00
shadlaws
0a10f3719a Follow-on to b01897af8d - add debugging message if Zend Guard code obfuscation is enabled to installer, too. 2013-02-12 22:21:50 +01:00
Bharat Mediratta
6e8a647d0b Merge pull request #137 from shadlaws/jquery_19_success_xhr
Updated success callbacks for gallery.panel.js and gallery.dialog.js
2013-02-12 09:25:21 -08: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
Bharat Mediratta
acf4aa01b9 Merge pull request #136 from shadlaws/jquery_19_libs
Finished jQuery library updates, current for 2013/02/12.
2013-02-12 09:22:38 -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
dc5b1a715b Formatting: cleaned up extra lines, whitespaces, converted tabs to spaces, etc. 2013-02-12 17:27:05 +01:00
shadlaws
ec0363fd36 Updated success callbacks for gallery.panel.js and gallery.dialog.js - no longer need to save xhr ahead of success.
Tested and seems to work well, even with watermarks on Chrome (previously an issue).
2013-02-12 17:19:28 +01:00
shadlaws
c8a084d5f2 Updated json.js library
- json.js  2012/10/08
- used non-minified to be consistent with other libraries
- updated filename in page.html.php call
2013-02-12 16:05:25 +01:00
shadlaws
78a044c7a3 Changed case of call to jquery.localScroll.js to match new standard. 2013-02-12 15:43:59 +01:00
shadlaws
c593645292 Finished jQuery library updates, current for 2013/02/12.
- jquery.js  1.9.1 (2013/02/04)
- jquery.cookie.js  1.3.1 (2013/01/30)
- jquery.scrollTo.js  1.4.5 (2012/12/14)
- jquery.localScroll.js  1.2.8b (2012/09/21)
Note: jquery.jeditable.js and jquery.MultiFile.js still removed, as they are no longer used.
2013-02-12 15:33:09 +01: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