mediagoblin.git
13 years agoRemoving these video javascript files, which are currently unused
Christopher Allan Webber [Fri, 25 Nov 2011 17:43:34 +0000 (11:43 -0600)]
Removing these video javascript files, which are currently unused

13 years agoRemove old enable_video config option
Christopher Allan Webber [Fri, 25 Nov 2011 17:42:03 +0000 (11:42 -0600)]
Remove old enable_video config option

13 years agoLoad multiple media types based on the media_types section of the config file
Christopher Allan Webber [Fri, 25 Nov 2011 17:41:24 +0000 (11:41 -0600)]
Load multiple media types based on the media_types section of the config file

13 years agoMerge remote-tracking branch 'remotes/jwandborg/master'
Christopher Allan Webber [Thu, 24 Nov 2011 21:24:58 +0000 (15:24 -0600)]
Merge remote-tracking branch 'remotes/jwandborg/master'

13 years agoRename MediaEntry.uploader() to .get_uploader()
Elrond [Mon, 21 Nov 2011 20:40:48 +0000 (21:40 +0100)]
Rename MediaEntry.uploader() to .get_uploader()

The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.

So renaming .uploader() to .get_uploader()

13 years ago652: Don't show empty field labels.
Elrond [Fri, 18 Nov 2011 22:37:25 +0000 (23:37 +0100)]
652: Don't show empty field labels.

If the label for a field is empty, don't show it at all.
And don't translate it!

13 years agoWrap long line.
Elrond [Tue, 22 Nov 2011 20:48:56 +0000 (21:48 +0100)]
Wrap long line.

Nothing else.

13 years agoAdded a message noticing the user the image has been successfully
Pablo J. Urbano Santos [Tue, 22 Nov 2011 20:07:09 +0000 (21:07 +0100)]
Added a message noticing the user the image has been successfully
deleted.

13 years agoFixes for video branch
Joar Wandborg [Tue, 22 Nov 2011 20:06:08 +0000 (21:06 +0100)]
Fixes for video branch

- Removed superfluous code from media_types.image
- Updated lazy_pass_to_ugettext imports

13 years agoFixes #597. Add a visible error when user tries to delete an image
Pablo J. Urbano Santos [Tue, 22 Nov 2011 19:29:33 +0000 (20:29 +0100)]
Fixes #597. Add a visible error when user tries to delete an image
without cheking the "I'm sure" checkbox.

13 years agoVideo support is disabled by default, set enable_video to true to enable
Joar Wandborg [Mon, 21 Nov 2011 23:09:41 +0000 (00:09 +0100)]
Video support is disabled by default, set enable_video to true to enable

13 years agoFixes after merging video into master - part 2
Joar Wandborg [Mon, 21 Nov 2011 22:38:31 +0000 (23:38 +0100)]
Fixes after merging video into master - part 2

- Added handling of InvalidFileType to submit.views
- Updated test_celery_setup and test_submission tests to reflect the changes to the
  media procesing infrastructure

13 years agoFixes after merging video branch into master
Joar Wandborg [Mon, 21 Nov 2011 22:18:40 +0000 (23:18 +0100)]
Fixes after merging video branch into master

- Removed debug output from init/celery
- Moved process_media/__init__ to processing.py
- Centralized the processing.ProcessMedia task class
  - Updated media managers to reference the processing function
    instead of the ProcessMedia instance
  - Updated new-style image processing to previous, newer old-style
    image processing
- Updated video transcoding
  - Changed method in progress output, sometimes
    message.structure['percent'] raises KeyError

13 years agoMerge branch 'video_gstreamer-only'
Joar Wandborg [Mon, 21 Nov 2011 20:51:30 +0000 (21:51 +0100)]
Merge branch 'video_gstreamer-only'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/submit/views.py

13 years agoRefractored GStreamer element linking
Joar Wandborg [Mon, 21 Nov 2011 20:47:00 +0000 (21:47 +0100)]
Refractored GStreamer element linking

13 years agoTests for StorageInterface*.copy_local_to_storage()
Christopher Allan Webber [Mon, 21 Nov 2011 04:25:22 +0000 (22:25 -0600)]
Tests for StorageInterface*.copy_local_to_storage()

13 years agoMade the image processing use intermediary conversion file.
Christopher Allan Webber [Mon, 21 Nov 2011 04:03:38 +0000 (22:03 -0600)]
Made the image processing use intermediary conversion file.

This should fix the problem with PIL and the cloudfiles storage system
fighting.

13 years agoSlightly clearer docs on copy_local_to_storage
Christopher Allan Webber [Mon, 21 Nov 2011 04:02:02 +0000 (22:02 -0600)]
Slightly clearer docs on copy_local_to_storage

13 years agocopy_local_to_storage, both general and specialized-for-BasicFileStorage versions
Christopher Allan Webber [Mon, 21 Nov 2011 04:01:43 +0000 (22:01 -0600)]
copy_local_to_storage, both general and specialized-for-BasicFileStorage versions

This utility should allow for easy copying from a local filesystem to
the storage instance.

13 years agoStashing changes
Joar Wandborg [Sun, 20 Nov 2011 23:06:59 +0000 (00:06 +0100)]
Stashing changes

13 years agofixed identation
Jakob Kramer [Sun, 20 Nov 2011 20:40:51 +0000 (21:40 +0100)]
fixed identation

13 years agoeyecandy for programmers
Jakob Kramer [Sun, 20 Nov 2011 20:30:46 +0000 (21:30 +0100)]
eyecandy for programmers

13 years agodon't use 'and' anymore, if there is only one tag
Jakob Kramer [Sun, 20 Nov 2011 20:15:07 +0000 (21:15 +0100)]
don't use 'and' anymore, if there is only one tag

13 years agoFix redirect to logical path
Elrond [Sun, 20 Nov 2011 19:15:21 +0000 (20:15 +0100)]
Fix redirect to logical path

redirects should in nearly all cases go to a logical path
like 'mediagoblin.auth.login' and not to an absolute path
like "/auth/login".

13 years agoMerge remote branch 'remotes/aaronw/bug614_verification_crash'
Elrond [Sun, 20 Nov 2011 19:00:08 +0000 (20:00 +0100)]
Merge remote branch 'remotes/aaronw/bug614_verification_crash'

* remotes/aaronw/bug614_verification_crash:
  Update english translation file.
  Reverse order of sanity checks: check email_verified after making sure there's a user in the request.
  Make sure user isn't already verified before resending verification.
  Check request.user to determine if user is logged in.
  Regenerated English .po file to include new string.
  Display and error and redirect to login page if unauthenticated user tries to access resend_verification.

Conflicts:
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po

13 years agoNavigation buttons edits. Removed images as they are no longer needed. Related: bug...
Jef van Schendel [Sun, 20 Nov 2011 16:01:23 +0000 (17:01 +0100)]
Navigation buttons edits. Removed images as they are no longer needed. Related: bug #504

13 years agoRemove Edit/Delete icons, since they are not required yet.
Jef van Schendel [Sun, 20 Nov 2011 15:45:45 +0000 (16:45 +0100)]
Remove Edit/Delete icons, since they are not required yet.

13 years agoChange tag list from a list to a paragraph. Wrap text for translation.
Jef van Schendel [Sun, 20 Nov 2011 15:18:27 +0000 (16:18 +0100)]
Change tag list from a list to a paragraph. Wrap text for translation.

13 years agoFix for bug #467, "Add explanatory copy to add/edit picture pages saying that tags...
Jef van Schendel [Sun, 20 Nov 2011 14:34:40 +0000 (15:34 +0100)]
Fix for bug #467, "Add explanatory copy to add/edit picture pages saying that tags are comma-separated"

13 years agoSlight style changes to button_action_highlight
Jef van Schendel [Sun, 20 Nov 2011 00:57:29 +0000 (01:57 +0100)]
Slight style changes to button_action_highlight

13 years agoSmall correction, this button should be button_action, not button_form
Jef van Schendel [Sun, 20 Nov 2011 00:57:02 +0000 (01:57 +0100)]
Small correction, this button should be button_action, not button_form

13 years agoSlight change to error wording
Jef van Schendel [Sun, 20 Nov 2011 00:46:21 +0000 (01:46 +0100)]
Slight change to error wording

13 years agoAnother change to button style. Renamed header_submit, header_submit_highlight and...
Jef van Schendel [Sun, 20 Nov 2011 00:43:48 +0000 (01:43 +0100)]
Another change to button style. Renamed header_submit, header_submit_highlight and button classes, correct all references to these

13 years agoChange to background of "empty_space", it now uses an image
Jef van Schendel [Sun, 20 Nov 2011 00:12:10 +0000 (01:12 +0100)]
Change to background of "empty_space", it now uses an image

13 years agoadded unittests, now using form errors and fixed bug when no GET parameter is given...
Jakob Kramer [Sat, 19 Nov 2011 23:35:09 +0000 (00:35 +0100)]
added unittests, now using form errors and fixed bug when no GET parameter is given for /edit/profile/

13 years agoadded support for changing the password, issue #643
Jakob Kramer [Sat, 19 Nov 2011 21:17:21 +0000 (22:17 +0100)]
added support for changing the password, issue #643

13 years agoChange button style a bit
Jef van Schendel [Sat, 19 Nov 2011 23:28:19 +0000 (00:28 +0100)]
Change button style a bit

13 years agoChange form structure and add relevant CSS rules
Jef van Schendel [Sat, 19 Nov 2011 22:46:42 +0000 (23:46 +0100)]
Change form structure and add relevant CSS rules

13 years agoAdded back the title block
Christopher Allan Webber [Sat, 19 Nov 2011 20:06:48 +0000 (14:06 -0600)]
Added back the title block

13 years agoMerge remote branch 'remotes/inconexo/613_custom_title'
Christopher Allan Webber [Sat, 19 Nov 2011 20:04:56 +0000 (14:04 -0600)]
Merge remote branch 'remotes/inconexo/613_custom_title'

13 years agoAdded Pablo Santos to the AUTHORS file
Christopher Allan Webber [Sat, 19 Nov 2011 20:03:01 +0000 (14:03 -0600)]
Added Pablo Santos to the AUTHORS file

13 years agoAllow user to set whether comments are ascending or descending
Christopher Allan Webber [Sat, 19 Nov 2011 20:01:38 +0000 (14:01 -0600)]
Allow user to set whether comments are ascending or descending

13 years agoMerge remote branch 'remotes/inconexo/441_comment_order'
Christopher Allan Webber [Sat, 19 Nov 2011 19:54:49 +0000 (13:54 -0600)]
Merge remote branch 'remotes/inconexo/441_comment_order'

13 years agoAdded Corey Farwell to the list of contributors
Christopher Allan Webber [Sat, 19 Nov 2011 19:42:30 +0000 (13:42 -0600)]
Added Corey Farwell to the list of contributors

13 years agoincorrect path in nginx config
Corey Farwell [Sat, 19 Nov 2011 18:43:31 +0000 (10:43 -0800)]
incorrect path in nginx config

13 years agomedia_home: order comments by ascending date.
Pablo J. Urbano Santos [Sat, 19 Nov 2011 18:15:41 +0000 (19:15 +0100)]
media_home: order comments by ascending date.

13 years agoAdded parameter ascending to MediaEntry::get_comments, if true, comments
Pablo J. Urbano Santos [Sat, 19 Nov 2011 18:11:42 +0000 (19:11 +0100)]
Added parameter ascending to MediaEntry::get_comments, if true, comments
will be ordered ascending, otherwise descending

13 years agoAllow instance owners to customize html titles of page:
Pablo J. Urbano Santos [Sat, 19 Nov 2011 16:07:41 +0000 (17:07 +0100)]
Allow instance owners to customize html titles of page:
Added html_title config option.
Made base.html template use html_title option as page title.

13 years agoAdd app_config and global_config to the template environment
Christopher Allan Webber [Sat, 19 Nov 2011 14:33:29 +0000 (08:33 -0600)]
Add app_config and global_config to the template environment

13 years agoAdding app_config and global_config to the template environment
Christopher Allan Webber [Sat, 19 Nov 2011 14:31:37 +0000 (08:31 -0600)]
Adding app_config and global_config to the template environment

13 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Fri, 18 Nov 2011 15:34:09 +0000 (09:34 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html

13 years agoAccidentally had user['profile'] where it shoulda been user['bio']
Christopher Allan Webber [Wed, 16 Nov 2011 23:53:46 +0000 (17:53 -0600)]
Accidentally had user['profile'] where it shoulda been user['bio']

13 years agoFixed video transcoding
Joar Wandborg [Wed, 16 Nov 2011 13:20:27 +0000 (14:20 +0100)]
Fixed video transcoding

- Added audiorate with tolerance 80 million
- Removed deprecated thumbnailer

13 years agoCommitting some futile attempts to make GStreamer transcode the audio properly.
Joar Wandborg [Tue, 15 Nov 2011 21:43:05 +0000 (22:43 +0100)]
Committing some futile attempts to make GStreamer transcode the audio properly.

- Added CPU count detection
- Added videorate
- Added audiorate

13 years agoDot-Notation: x._id = ObjectId() doesn't seem to work properly
Elrond [Mon, 14 Nov 2011 16:11:37 +0000 (17:11 +0100)]
Dot-Notation: x._id = ObjectId() doesn't seem to work properly

For whatever reason, this does not work as expected:
entry._id = ObjectId()
Need to go this way:
entry['_id'] = ObjectId()

13 years agoDot-Notation for "_id"
Elrond [Sun, 13 Nov 2011 18:25:06 +0000 (19:25 +0100)]
Dot-Notation for "_id"

Note: Migrations can't use "Dot Notation"!

Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.

13 years agoEnable mongokit's "Dot notation"
Elrond [Mon, 14 Nov 2011 13:21:06 +0000 (14:21 +0100)]
Enable mongokit's "Dot notation"

mongokit documents can allow to use x.FIELD instead of
x["FIELD"].
First it looks a lot more pythonic.
Second it might allow us an easier migration path towards
an sqlalchemy database backend.

Docs: http://namlook.github.com/mongokit/tutorial.html#dot-notation

13 years agoexport: Handle Unicode titles better in logging
Elrond [Tue, 15 Nov 2011 10:21:15 +0000 (11:21 +0100)]
export: Handle Unicode titles better in logging

log("ascii %s" % unicode_string) tries to convert unicode
to ascii, which might fail.

Better use log(u"unicode format %s" % unicode_string) and
let the logging framework handle the conversion. This works
much better and the exceptions still happening aren't
stopping the main app.

Also remove one useless import.

13 years agomoved from videoscale => ffvideoscale *and* put queus before video and audio pipes
Joar Wandborg [Mon, 14 Nov 2011 23:27:21 +0000 (00:27 +0100)]
moved from videoscale => ffvideoscale *and* put queus before video and audio pipes

13 years agoOnly show "post a comment" link if comments already exist
Christopher Allan Webber [Mon, 14 Nov 2011 02:39:42 +0000 (20:39 -0600)]
Only show "post a comment" link if comments already exist

The purpose of the link is to help you jump past comments to the
comment box, and so...

Even with this new conditional, I'm not entirely sure I like that link ;)

13 years agoMerge remote-tracking branch 'remotes/nyergler/pep8-ification'
Christopher Allan Webber [Mon, 14 Nov 2011 02:23:26 +0000 (20:23 -0600)]
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/user_pages/views.py
mediagoblin/util.py

13 years agoImproving <title> on tag page *and* adjusting translation for RTL reasons
Christopher Allan Webber [Sun, 13 Nov 2011 20:48:51 +0000 (14:48 -0600)]
Improving <title> on tag page *and* adjusting translation for RTL reasons

Basically moving the variable inside the translation to give
translators more flexibility

13 years agoEnhanced title on the user's main media gallery
Christopher Allan Webber [Sun, 13 Nov 2011 20:42:03 +0000 (14:42 -0600)]
Enhanced title on the user's main media gallery

13 years agoIf the gallery view makes sure we have a user anyway, do we need this check?
Christopher Allan Webber [Sun, 13 Nov 2011 20:40:11 +0000 (14:40 -0600)]
If the gallery view makes sure we have a user anyway, do we need this check?

Seems like the classic annoying "SHOULD NEVER HAPPEN" else: statement :)

13 years agoEnhanced title for user profile page
Christopher Allan Webber [Sun, 13 Nov 2011 20:38:40 +0000 (14:38 -0600)]
Enhanced title for user profile page

13 years agoImproved title block on media page
Christopher Allan Webber [Sun, 13 Nov 2011 20:34:22 +0000 (14:34 -0600)]
Improved title block on media page

13 years agoMerge remote-tracking branch 'remotes/nyergler/issue-653-csrf-exception'
Christopher Allan Webber [Sun, 13 Nov 2011 20:20:16 +0000 (14:20 -0600)]
Merge remote-tracking branch 'remotes/nyergler/issue-653-csrf-exception'

13 years agoIssue 653: This time for sure!
Nathan Yergler [Sun, 13 Nov 2011 20:07:09 +0000 (12:07 -0800)]
Issue 653: This time for sure!

13 years agoIssue 653: Handle the case where request.vary is None
Nathan Yergler [Sun, 13 Nov 2011 19:59:24 +0000 (11:59 -0800)]
Issue 653: Handle the case where request.vary is None

13 years agoIssue 653: Don't throw exception if response has no vary header.
Nathan Yergler [Sun, 13 Nov 2011 19:41:43 +0000 (11:41 -0800)]
Issue 653: Don't throw exception if response has no vary header.

13 years agoMark two strings for translation
Elrond [Sun, 13 Nov 2011 18:51:11 +0000 (19:51 +0100)]
Mark two strings for translation

13 years agoFinal step for non-force-conversion to jpeg
Christopher Allan Webber [Sat, 12 Nov 2011 21:12:39 +0000 (15:12 -0600)]
Final step for non-force-conversion to jpeg

13 years agoDon't force-convert resized images to JPEG.
Christopher Allan Webber [Sat, 12 Nov 2011 19:35:41 +0000 (13:35 -0600)]
Don't force-convert resized images to JPEG.

That's just not nice for those of us who like transparency!

13 years agoProbably should have MANIFEST.in checked in, for doing python sdists
Christopher Allan Webber [Sat, 12 Nov 2011 14:10:46 +0000 (08:10 -0600)]
Probably should have MANIFEST.in checked in, for doing python sdists

13 years ago640: Configuration files should mention their _local versions
Elrond [Sat, 12 Nov 2011 13:26:35 +0000 (14:26 +0100)]
640: Configuration files should mention their _local versions

Thanks go to Aleksej Serdjukov for bringing this up and
providing the patch in the bug!

13 years agoMerge branch 'idea/check_mgoblin_static'
Elrond [Sat, 12 Nov 2011 12:39:50 +0000 (13:39 +0100)]
Merge branch 'idea/check_mgoblin_static'

* idea/check_mgoblin_static:
  Move TestingMiddleware to tests/tools.py
  Some docs for the TestingMiddleware
  591: Let Testing Middleware check for staticdirect() usage

13 years agoMove TestingMiddleware to tests/tools.py
Elrond [Sat, 12 Nov 2011 12:21:41 +0000 (13:21 +0100)]
Move TestingMiddleware to tests/tools.py

This middleware isn't needed outside of the tests, so let's
just put it there.

13 years agoSome docs for the TestingMiddleware
Elrond [Sun, 30 Oct 2011 19:51:55 +0000 (20:51 +0100)]
Some docs for the TestingMiddleware

To make the TestingMiddleware actually more useful in the
future, start to document it.

13 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Fri, 4 Nov 2011 13:23:48 +0000 (08:23 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

13 years agoUpdating translations
Christopher Allan Webber [Fri, 4 Nov 2011 13:23:28 +0000 (08:23 -0500)]
Updating translations

13 years agoTiny padding change to vertically center navigation button arrows
Jef van Schendel [Fri, 4 Nov 2011 01:34:00 +0000 (02:34 +0100)]
Tiny padding change to vertically center navigation button arrows

13 years agoSmall style changes to navigation buttons
Jef van Schendel [Fri, 4 Nov 2011 01:30:07 +0000 (02:30 +0100)]
Small style changes to navigation buttons

13 years agoOn second thought, let's use this title for forgot_password.html
Jef van Schendel [Fri, 4 Nov 2011 01:20:26 +0000 (02:20 +0100)]
On second thought, let's use this title for forgot_password.html

13 years agoText edits and rearrangements to login.html
Jef van Schendel [Fri, 4 Nov 2011 01:19:35 +0000 (02:19 +0100)]
Text edits and rearrangements to login.html

13 years agoAdd translation brackety things to forgot-password page, I forgot those
Jef van Schendel [Fri, 4 Nov 2011 01:15:52 +0000 (02:15 +0100)]
Add translation brackety things to forgot-password page, I forgot those

13 years agoText changes to forgot-paddword page
Jef van Schendel [Fri, 4 Nov 2011 01:14:19 +0000 (02:14 +0100)]
Text changes to forgot-paddword page

13 years agoText changes to front page, as described in ticket #637
Jef van Schendel [Fri, 4 Nov 2011 01:06:33 +0000 (02:06 +0100)]
Text changes to front page, as described in ticket #637

13 years agoSeveral small changes (reordering/restyling) for media descriptions and comments
Jef van Schendel [Fri, 4 Nov 2011 00:54:41 +0000 (01:54 +0100)]
Several small changes (reordering/restyling) for media descriptions and comments

13 years agoCorrecting the mediagoblin static/media aliases in the deployment guide
Christopher Allan Webber [Thu, 3 Nov 2011 22:10:39 +0000 (17:10 -0500)]
Correcting the mediagoblin static/media aliases in the deployment guide

13 years agoA correct but compact set of instructions for fastcgi on nginx
Christopher Allan Webber [Thu, 3 Nov 2011 15:59:47 +0000 (10:59 -0500)]
A correct but compact set of instructions for fastcgi on nginx

13 years agoIndentation was off by one ;)
Christopher Allan Webber [Thu, 3 Nov 2011 15:27:39 +0000 (10:27 -0500)]
Indentation was off by one ;)

13 years agoWe left out a critical fastcgi variable from the nginx config
Christopher Allan Webber [Thu, 3 Nov 2011 15:23:53 +0000 (10:23 -0500)]
We left out a critical fastcgi variable from the nginx config

13 years agoRecommendation to install flup!
Christopher Allan Webber [Thu, 3 Nov 2011 14:41:48 +0000 (09:41 -0500)]
Recommendation to install flup!

13 years ago0.1.0, also in the docs file! ;)
Christopher Allan Webber [Wed, 2 Nov 2011 14:09:35 +0000 (09:09 -0500)]
0.1.0, also in the docs file! ;)

13 years ago0.1.0!
Christopher Allan Webber [Wed, 2 Nov 2011 14:08:45 +0000 (09:08 -0500)]
0.1.0!

13 years agoRemoved the bloof print debugging
Christopher Allan Webber [Wed, 2 Nov 2011 13:55:02 +0000 (08:55 -0500)]
Removed the bloof print debugging

13 years agoMake sure you can't force comments on entries that don't exist.
Christopher Allan Webber [Wed, 2 Nov 2011 13:53:33 +0000 (08:53 -0500)]
Make sure you can't force comments on entries that don't exist.

See: http://bugs.foocorp.net/issues/621

13 years agoUpdated logo from Thorsten Wilms!
Christopher Allan Webber [Wed, 2 Nov 2011 04:55:19 +0000 (23:55 -0500)]
Updated logo from Thorsten Wilms!

13 years agoUpdated translations
Christopher Allan Webber [Wed, 2 Nov 2011 04:15:37 +0000 (23:15 -0500)]
Updated translations

13 years agoMinor fixes
Joar Wandborg [Tue, 1 Nov 2011 22:00:35 +0000 (23:00 +0100)]
Minor fixes

- Added error handling for PyGTK import
- Added 'mkv' to the video media manager