Commit Graph

390 Commits

Author SHA1 Message Date
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
Bharat Mediratta
49f6ce2d94 gallery.menalto.com -> galleryproject.org
codex.gallery2.org -> codex.galleryproject.org

Fixes #1957.
2013-01-22 18:39:24 -05: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
epeay
d8dce1e3e5 Updated Select Photos button hitbox to cover full visible button area. 2012-10-08 16:41:02 -04: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
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
713a06f234 Do a better job of escaping filenames when uploading. Fixes #1881. 2012-06-05 20:20:21 -07:00
Bharat Mediratta
91e87cb811 Oops, fix indentation in 99af395a01 2012-05-16 11:32:11 -07:00
Bharat Mediratta
99af395a01 Force the error page to UTF-8. Fixes #1868. 2012-05-16 11:07:26 -07:00
Bharat Mediratta
916f5c7d3b Clean up message to preserve page formatting. Fixes #1848. 2012-05-05 19:55:29 -07:00
Bharat Mediratta
f6dac703ec Try a different approach at filtering. Fixes #1831. 2012-04-01 11:53:34 -07:00
Chad Parry
44b624f6fb Squashed commit of the following:
commit 41d379c2b777ae7b3a11f528971228e234f8976f
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:10:10 2011 -0600

    Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion.

commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426
Merge: 8f7904a 403f64b
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jul 20 21:02:56 2011 -0600

    Merge branch 'master' into rawphoto

commit 403f64bf2a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Tue Jul 12 21:44:14 2011 -0700

    Automated update of .build_number to 163 for branch master
    Last update: e8382b960a (1 commits ago)

commit 51726f9e4b
Author: Tim Almdal <tnalmdal@shaw.ca>
Date:   Tue Jul 12 21:44:40 2011 -0700

    Fix for ticket #1752.  Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album.

commit e8382b960a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:27:04 2011 -0700

    Automated update of .build_number to 162 for branch master
    Last update: 40cda7fa3f (1 commits ago)

commit 1afbcafe0e
Merge: 40cda7f fc6c139
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:26:41 2011 -0700

    Merge pull request #56 from alindeman/alindeman/1758

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 40cda7fa3f
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:25:54 2011 -0700

    Automated update of .build_number to 161 for branch master
    Last update: 771de0a374 (1 commits ago)

commit aa08df7f0a
Merge: 771de0a 784c429
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:25:46 2011 -0700

    Merge pull request #55 from alindeman/alindeman/1757

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit fc6c1390d3
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 08:25:50 2011 -0400

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 784c429070
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 07:24:37 2011 -0400

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1
Merge: e950573 771de0a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Jun 25 14:12:39 2011 -0600

    Merge branches 'master' and 'rawphoto' into rawphoto

commit e95057337996351e49915d9f85d007d50103a4be
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jun 15 20:24:18 2011 -0600

    Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
2011-07-21 00:11:52 -06:00
Chad Parry
b875368167 This patch helps provide raw photo support with some small changes to the framework. Items can now change their extension and MIME type.
Squashed commit of the following:

commit 4c2b2ebd3f
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f128
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f57
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa0
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b79
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
2011-04-28 19:41:44 -06:00
Bharat Mediratta
b0285f770e Add appropriate preamble. #1696, #1698 2011-04-25 22:07:47 -07:00
Chad Kieffer
b4cdd016dc Third times the charm. Rethink unordered lists and bullets. Revert to turning them off by default and provide a new class, g-text, to define a list or a section of text as needing to display bullets. 2011-04-24 11:53:29 -04:00
Tim Almdal
92c23ea92d Set the width of the information column to 60px to prevent icon wrap 2011-04-23 15:10:04 -07:00
Bharat Mediratta
923b5ae20a Merge branch 'master' of github.com:gallery/gallery3 2011-04-23 14:44:48 -07:00
Bharat Mediratta
a469146084 module.info and theme.info files now support author name, author url,
info url and discussion url fields.  Those fields show up in the Admin
> Modules and Admin > Appearance > Theme Choice pages.  All official
modules and themes updated to contain these values.  Fixes #1696, #1698.
2011-04-23 14:43:33 -07:00
Tim Almdal
7ec0cc748a Fix for ticket #1699. Make the link to return to the gallery installation clearer. 2011-04-23 13:55:23 -07:00
Andy Lindeman
cc8d881973 Add iPad/iPhone support for video playback
* Resolves #1634
2011-04-23 16:20:54 -04:00
Bharat Mediratta
76a7ad3161 Overhaul of the uploader code:
- Propagate size limits (including detecting memory limits from GD) down to the
  Flash so that we don't even start uploads that won't work
- Improve the error messages to be more user meaningful and provide links to the
  codex for errors
- Tell the user up front what the file size limit is.

Fixes #1638
2011-04-23 10:07:32 -07:00
Chris Kelly
1af4f99108 Add missing CSS tag so tables get aligned. Fixes #1678. 2011-04-21 14:01:02 -07:00
Bharat Mediratta
9fe2056106 Use window.location = "url" instead of window.location.reload() so
that we pop back up to the top of the page so that you see the status
message.  Fixes #1676.
2011-04-21 13:59:03 -07:00
Bharat Mediratta
916b7543d1 Gracefully degrade in the case where the .build_number file is
missing.  Fixes #1673.
2011-04-10 13:46:28 -07:00
mamouneyya
5931cc872d proposed fix for ticket #1664 2011-04-02 15:59:54 -07:00
Bharat Mediratta
20ae106c22 Display a message in the "Check for Gallery upgrades" block when
there's a newer version available, even if the user has dismissed the
site status message.  #1605.
2011-01-17 21:16:43 -08:00
Bharat Mediratta
70abfb2a20 Upgrade checking code is now here, along with a bump of the Gallery
module to v46.  There's a new block in the admin dashboard which
controls whether automatic checking happens, and lets you check
immediately.  If a newer version is detected, a site status message
appears for admins providing upgrade instructions.

Automatic checking is not yet implemented (even though the UI claims
that it exists).  This is all for #1605.
2011-01-16 22:16:09 -08:00
Bharat Mediratta
ac44e9c930 First step in setting up version checking.
We now have two types of packages (release, git).  Instead of using
constants, we now have gallery::version_string() which returns the
current version string.  If you're on a release package, then the
version string looks like:

  3.0 (Santa Fe)

If you're on a git package, then the version string looks like this:

  3.0.1 (branch 3.0.x build 3)

We track the build number in a new file in the gallery3 root called
BUILD_NUMBER which we will update periodically with the latest
build number for each branch.
2011-01-16 16:58:58 -08:00
Joe7
07acd2b750 Set video player to keep the aspect ratio of the video when playing in fullscreen
Fixes ticket #1154 - credit goes to floridave
2011-01-08 06:09:44 +01:00
Bharat Mediratta
b9e11a6f93 Don't show the "can't find ffmpeg" message to non-admins. Fixes #1528. 2010-12-15 15:16:00 -08:00
Bharat Mediratta
12b77c7ef4 Move the sys_getloadavg() call into the template since that's what we're doing for other similar calls 2010-11-20 20:54:16 -08:00
Bharat Mediratta
945e79b171 Add a pure javascript mechanism for filtering advanced properties. Partial fix for #1478. 2010-11-08 13:51:51 -08:00
Bharat Mediratta
86981c5afb Use the "loading" image from themes/wind since it's no longer in gallery3/lib. 2010-10-01 21:09:14 -07:00
Bharat Mediratta
f84782d620 Stop caching all module variables in the vars table using the
name=_cache row.  If that overflows, it will cause us to be unable to
load variables, and we can't recover from that.

Instead, use the Cache table.  Bump the gallery module to v40.  Fixes
ticket #1405.
2010-09-29 20:47:43 -07:00
Bharat Mediratta
de2f9baeee Add a link to
http://codex.gallery2.org/Gallery3:Choosing_A_Graphics_Toolkit to help
users choose a graphics toolkit.  Fixes ticket #1372.
2010-09-16 19:34:42 -07:00
Bharat Mediratta
4b8d6beb5e Report the graphics toolkit in the platform block. 2010-09-14 19:40:54 -07:00
Bharat Mediratta
14ae1fde25 Use the actual csrf token, not the placeholder (url::site doesn't
replace that).  Fixes ticket #1361
2010-09-11 10:41:47 -07:00
Bharat Mediratta
67f45cfa78 Add CSRF protection to the upgrader. And update the CLI output so
that it tells you which modules failed to upgrade properly.  Fixes
ticket #1359.
2010-09-11 01:46:45 -07:00
Bharat Mediratta
391a90e3ce Detect when a module fails to upgrade properly and put up an
informative message to help the user know that she needs to get a
newer copy of the module.  Fixes ticket #1189.
2010-09-08 20:36:22 -07:00
Bharat Mediratta
cb22f23be6 Show the "view log" button for tasks that are running, in case they're
paused/abandoned for some reason and we want to know more details.
2010-09-06 14:16:26 -07:00
Bharat Mediratta
fc856b6aba Add retry logic to the task framework. We retry 4 times with
increasing backoff and if that fails, we put up a manual "retry" link.
Fixes ticket #1270.
2010-09-06 14:08:05 -07:00
Bharat Mediratta
80e9fcaf47 Don't use $.remove() to get rid of items from the uploadify queue;
that breaks uploadify and causes it to be unable to upload any new
items.  Fixes ticket #1324.
2010-09-01 22:00:26 -07:00
Bharat Mediratta
db769b76ab Expire completed uploads and introduce a text message that says how
many photos have been uploaded successfully.  This is to pave the way
for retry code later on.
2010-08-31 00:03:46 -07:00
Bharat Mediratta
953d63555c Detect Flash and put up a reasonable message if your browser doesn't
have Flash installed.  Fixes ticket #1268.
2010-08-30 22:19:57 -07:00
Bharat Mediratta
bc0d5e79cb Revert "Change the theme option page to display using tabs if the site theme has an admin page."
This reverts commit d66c496fb1.

Conflicts:

	modules/gallery/helpers/theme.php
	modules/gallery/views/admin_theme_options.html.php
	themes/admin_wind/css/screen.css
2010-08-29 23:09:52 -07:00
Bharat Mediratta
2018831015 1) Rename "Cancel All" -> "Cancel uploads" to clarify what we're
talking about and follow our capitalization standards.
2) Grey out the Done button when uploads are in progress.
Fixes ticket #1302.
2010-08-29 16:39:01 -07:00
Bharat Mediratta
04add75f6f Get rid of the move dialog and move option. Instead, replace it with
a call to Organize with the appropriate album open.  I have not yet
figured out how to get the SWF code to highlight the active image, but
that's coming.  Partial fix for #1204.
2010-08-22 00:27:24 -07:00
Bharat Mediratta
c6a28a93dd Put up a warning and don't accept movie files if we don't have ffmpeg.
This fixes ticket #973.
2010-08-21 15:11:06 -07:00
Tim Almdal
65801cf2e0 Fix a typo to the case correction. 2010-08-21 14:05:29 -07:00
Tim Almdal
33e76f5e33 Correct incorrect case on dialog title. 2010-08-21 14:05:29 -07:00