Will Kahn-Greene [Mon, 12 Dec 2011 16:12:59 +0000 (11:12 -0500)]
Fix doc footer
This has the correct copyright statement.
Will Kahn-Greene [Mon, 12 Dec 2011 15:48:24 +0000 (10:48 -0500)]
Tweak rest formatting
Christopher Allan Webber [Mon, 12 Dec 2011 15:45:45 +0000 (09:45 -0600)]
Updated translations
Christopher Allan Webber [Mon, 12 Dec 2011 15:44:48 +0000 (09:44 -0600)]
Added the "Media types" chapter
Will Kahn-Greene [Mon, 12 Dec 2011 15:20:05 +0000 (10:20 -0500)]
Doc updates
* fixed some language
* fixed some consistency issues
* fixed some 80-line-width issues
* fixed some typos and markup problems
Will Kahn-Greene [Mon, 12 Dec 2011 15:17:03 +0000 (10:17 -0500)]
Add some documentation to lazyserver.sh
I had no idea what it did, so I asked and tossed the answer at the
top of the script.
Will Kahn-Greene [Mon, 12 Dec 2011 14:53:41 +0000 (09:53 -0500)]
Update README
* tweaked some language
* fixed some statements that aren't correct anymore
Will Kahn-Greene [Mon, 12 Dec 2011 14:46:23 +0000 (09:46 -0500)]
Tweak runtests to be more helpful
If nose isn't installed, then runtests.sh says it can't find nosetests
and exits, but doesn't tell you what you need to do to fix the situation.
This fixes that.
Christopher Allan Webber [Mon, 12 Dec 2011 14:15:16 +0000 (08:15 -0600)]
Removed extraneous whitespace from video.html
Christopher Allan Webber [Mon, 12 Dec 2011 14:13:46 +0000 (08:13 -0600)]
Add a note on how to up the upload size limit
Christopher Allan Webber [Mon, 12 Dec 2011 14:10:10 +0000 (08:10 -0600)]
Allow administrators to disable keeping the original. That's the new default!
Christopher Allan Webber [Mon, 12 Dec 2011 13:35:47 +0000 (07:35 -0600)]
Mark "newer/older" buttons for translation
Christopher Allan Webber [Mon, 5 Dec 2011 14:37:20 +0000 (08:37 -0600)]
Update comment URLs to use the media slug.
Christopher Allan Webber [Mon, 5 Dec 2011 14:35:42 +0000 (08:35 -0600)]
Update the delete item to use the _id after all... it's the safest way.
See http://bugs.foocorp.net/issues/695
Christopher Allan Webber [Mon, 5 Dec 2011 05:58:58 +0000 (23:58 -0600)]
Cloudfiles not actually a dependency, removing from setup.py
If users want cloudfiles, they can always ./bin/easy_install it.
Christopher Allan Webber [Mon, 5 Dec 2011 05:14:08 +0000 (23:14 -0600)]
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
tycho garen [Sun, 4 Dec 2011 22:06:54 +0000 (17:06 -0500)]
DOCS:: #675 revision to deployment and production documents
Christopher Allan Webber [Sun, 4 Dec 2011 21:27:00 +0000 (15:27 -0600)]
Filled in reason #3 to submit separate out celery.
Christopher Allan Webber [Sun, 4 Dec 2011 20:39:42 +0000 (14:39 -0600)]
Fix button word-wrapping issue
Christopher Allan Webber [Sun, 4 Dec 2011 19:59:13 +0000 (13:59 -0600)]
Merge remote-tracking branch 'tychoish/master'
Christopher Allan Webber [Sun, 4 Dec 2011 19:57:35 +0000 (13:57 -0600)]
Compiled the .mo files too
Christopher Allan Webber [Sun, 4 Dec 2011 19:56:55 +0000 (13:56 -0600)]
Updated translations
tycho garen [Sun, 4 Dec 2011 19:51:00 +0000 (14:51 -0500)]
DOCS: update to deployment documentation and new production deployments doc
Christopher Allan Webber [Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Sun, 4 Dec 2011 16:24:42 +0000 (10:24 -0600)]
Removing the conditional that checks if there's a media in media.html
If there isn't a media, we shouldn't hit that template! The view
should ensure that.
Christopher Allan Webber [Sun, 4 Dec 2011 16:21:58 +0000 (10:21 -0600)]
Change "Your finest source of goblin related media" to something else
We don't want to insist everyone hold a goblin-related gallery :)
Elrond [Sun, 4 Dec 2011 13:59:33 +0000 (14:59 +0100)]
Merge branch 'misc/fixture_add_user'
* misc/fixture_add_user:
fixture_add_user: Factoring a unit test tool
Christopher Allan Webber [Sun, 4 Dec 2011 03:59:52 +0000 (21:59 -0600)]
Most users won't see this but having space after prompt still nice for passwords.
Christopher Allan Webber [Sun, 4 Dec 2011 03:56:30 +0000 (21:56 -0600)]
PEP-8'ifying prompt_if_not_set
Christopher Allan Webber [Sun, 4 Dec 2011 03:43:15 +0000 (21:43 -0600)]
Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt'
Christopher Allan Webber [Sun, 4 Dec 2011 03:38:45 +0000 (21:38 -0600)]
Raise a slightly useful exception when we can't find the media type.
Christopher Allan Webber [Sat, 3 Dec 2011 22:59:20 +0000 (16:59 -0600)]
Updated translations
Elrond [Sat, 3 Dec 2011 21:11:54 +0000 (22:11 +0100)]
Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'
* remotes/manolinux/671_spaces_in_tag_list_edit:
* Feature #678: Drop custom delimiters in tags * Eliminate the definition of the tag delimiter for tests. * Remove a test that was related to custom tags delimiter. * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read * Modify a test to include this space.
* Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma. * Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
Elrond [Sat, 3 Dec 2011 20:20:11 +0000 (21:20 +0100)]
Bug #685: only provide CSRF token if it exists
This was suggested by Nathan Yergler in the bug logs.
Just implementing it.
- Let render_csrf_form_token return None, if the CSRF_TOKEN
is not available in the environ, because the
process_request part of the meddleware has not yet run.
- In render_template: If the returned value from above is
None, then do not add the csrf_token to the templates
context.
Elrond [Sat, 3 Dec 2011 15:45:33 +0000 (16:45 +0100)]
Bug #685: Add failing unit test
The simplest way to reproduce Bug #685 is to ask for a non
existent page. This should return a proper 404. It
currently doesn't.
So add a unit test exactly for this.
This unit test fails currently! It will fail until the bug
gets fixed.
Manuel Urbano Santos [Sat, 3 Dec 2011 14:36:02 +0000 (15:36 +0100)]
Prompt for arguments in adduser if not present (I created a function in util.py to check and prompt for arguments).
Manuel Urbano Santos [Sat, 3 Dec 2011 13:29:28 +0000 (14:29 +0100)]
Change adduser arguments from positional to --keyword style.
Jef van Schendel [Sat, 3 Dec 2011 00:19:15 +0000 (01:19 +0100)]
Changed comment error message wording slightly. Btw, should we translate these things?
Christopher Allan Webber [Fri, 2 Dec 2011 22:13:14 +0000 (16:13 -0600)]
We should use the variable local_templates instead of user_template_path
Elrond [Thu, 1 Dec 2011 23:09:13 +0000 (00:09 +0100)]
Expect 404 in unit tests, if we now use 404.
Our unit tests for auth were expecting a 400.
Well, now we give a 404. So expect that!
I'm not completely sure, if the 404 is the right thing
here, but that's another topic.
Christopher Allan Webber [Thu, 1 Dec 2011 22:59:22 +0000 (16:59 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Thu, 1 Dec 2011 22:58:56 +0000 (16:58 -0600)]
Should be 404 for 404s, not 400 :)
Elrond [Thu, 1 Dec 2011 22:33:47 +0000 (23:33 +0100)]
fixture_add_user: Factoring a unit test tool
Some unit tests need a user in the database, especially to
act as that user. Some routines did that on their own. So
factored this whole thing into a new function and use it
around.
Christopher Allan Webber [Thu, 1 Dec 2011 21:21:15 +0000 (15:21 -0600)]
Don't barf on templates that use the autoescaping extension
Elrond [Mon, 28 Nov 2011 17:40:45 +0000 (18:40 +0100)]
Merge remote branch 'remotes/nyergler/issue-680-csrf-optout'
* remotes/nyergler/issue-680-csrf-optout:
Issue 680 Allow decorating views to prevent CSRF protection.
Issue 680: Dispatch meddleware request processing post-routing
Elrond [Mon, 28 Nov 2011 08:45:15 +0000 (09:45 +0100)]
Mark two strings for translation
1. "Go to page:" in pagination
2. "Submit" in the forget password form
Elrond [Sun, 27 Nov 2011 22:23:20 +0000 (23:23 +0100)]
Merge remote branch 'remotes/manolinux/683_text_separate_tags_by_commas_and_spaces'
* remotes/manolinux/683_text_separate_tags_by_commas_and_spaces:
Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore.
Christopher Allan Webber [Sun, 27 Nov 2011 21:31:42 +0000 (15:31 -0600)]
Updating translations
Manuel Urbano Santos [Sun, 27 Nov 2011 13:31:20 +0000 (14:31 +0100)]
Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore.
Manuel Urbano Santos [Sun, 27 Nov 2011 12:55:07 +0000 (13:55 +0100)]
* Feature #678: Drop custom delimiters in tags
* Eliminate the definition of the tag delimiter for tests.
* Remove a test that was related to custom tags delimiter.
* Bug #671: Tags list on Edit page is not seperated by spaces and hard to read
* Modify a test to include this space.
Manuel Urbano Santos [Sun, 27 Nov 2011 12:49:47 +0000 (13:49 +0100)]
* Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma.
* Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
Nathan Yergler [Sat, 26 Nov 2011 23:32:35 +0000 (15:32 -0800)]
Issue 680 Allow decorating views to prevent CSRF protection.
Nathan Yergler [Sat, 26 Nov 2011 22:34:36 +0000 (14:34 -0800)]
Issue 680: Dispatch meddleware request processing post-routing
Elrond [Sat, 26 Nov 2011 12:50:06 +0000 (13:50 +0100)]
Merge remote branch 'remotes/inconexo/588_lowercase_extension'
* remotes/inconexo/588_lowercase_extension:
Filename extensions are lowercased before uploading the image.
The merge failed really. It tried to apply the changes to
the wrong file. So applied them by hand to
mediagoblin/media_types/image/processing.py
Conflicts:
mediagoblin/processing.py
Elrond [Sun, 23 Oct 2011 21:29:15 +0000 (23:29 +0200)]
Use setup_global_and_app_config in gmg's migrate.
Instead of using read_mediagoblin_config, forgetting to
check the validation report and then finding the main app
section by hand, just use setup_global_and_app_config.
Elrond [Fri, 25 Nov 2011 21:16:18 +0000 (22:16 +0100)]
Add base class for Meddleware
Created a BaseMeddleware which all Meddleware should derive
from. This is not strictly needed, but will greatly help.
The base class has the common __init__ of all the other
Meddlwares and fall backs for all hooks. That way a new
Meddlware only needs to override what it actually wants to
implement.
Christopher Allan Webber [Fri, 25 Nov 2011 18:33:34 +0000 (12:33 -0600)]
Uncommenting requires=['gst'] till I figure out why Joar added it there :)
Christopher Allan Webber [Fri, 25 Nov 2011 18:13:56 +0000 (12:13 -0600)]
Rename MediaGoblin middleware to meddleware to avoid confusion w/ wsgi middleware
hehehehehe, "meddleware"
Christopher Allan Webber [Fri, 25 Nov 2011 17:43:34 +0000 (11:43 -0600)]
Removing these video javascript files, which are currently unused
Christopher Allan Webber [Fri, 25 Nov 2011 17:42:03 +0000 (11:42 -0600)]
Remove old enable_video config option
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
Christopher Allan Webber [Thu, 24 Nov 2011 21:24:58 +0000 (15:24 -0600)]
Merge remote-tracking branch 'remotes/jwandborg/master'
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()
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!
Elrond [Tue, 22 Nov 2011 20:48:56 +0000 (21:48 +0100)]
Wrap long line.
Nothing else.
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.
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
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.
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
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
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
Pablo J. Urbano Santos [Mon, 21 Nov 2011 21:42:55 +0000 (22:42 +0100)]
Filename extensions are lowercased before uploading the image.
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
Joar Wandborg [Mon, 21 Nov 2011 20:47:00 +0000 (21:47 +0100)]
Refractored GStreamer element linking
Christopher Allan Webber [Mon, 21 Nov 2011 04:25:22 +0000 (22:25 -0600)]
Tests for StorageInterface*.copy_local_to_storage()
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.
Christopher Allan Webber [Mon, 21 Nov 2011 04:02:02 +0000 (22:02 -0600)]
Slightly clearer docs on copy_local_to_storage
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.
Joar Wandborg [Sun, 20 Nov 2011 23:06:59 +0000 (00:06 +0100)]
Stashing changes
Jakob Kramer [Sun, 20 Nov 2011 20:40:51 +0000 (21:40 +0100)]
fixed identation
Jakob Kramer [Sun, 20 Nov 2011 20:30:46 +0000 (21:30 +0100)]
eyecandy for programmers
Jakob Kramer [Sun, 20 Nov 2011 20:15:07 +0000 (21:15 +0100)]
don't use 'and' anymore, if there is only one tag
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".
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
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
Jef van Schendel [Sun, 20 Nov 2011 15:45:45 +0000 (16:45 +0100)]
Remove Edit/Delete icons, since they are not required yet.
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.
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"
Jef van Schendel [Sun, 20 Nov 2011 00:57:29 +0000 (01:57 +0100)]
Slight style changes to button_action_highlight
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
Jef van Schendel [Sun, 20 Nov 2011 00:46:21 +0000 (01:46 +0100)]
Slight change to error wording
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
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
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/
Jakob Kramer [Sat, 19 Nov 2011 21:17:21 +0000 (22:17 +0100)]
added support for changing the password, issue #643
Jef van Schendel [Sat, 19 Nov 2011 23:28:19 +0000 (00:28 +0100)]
Change button style a bit
lora [Sat, 19 Nov 2011 23:01:40 +0000 (17:01 -0600)]
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
lora [Sat, 19 Nov 2011 23:00:25 +0000 (17:00 -0600)]
issue 582: use media.slug instead of media.id
Jef van Schendel [Sat, 19 Nov 2011 22:46:42 +0000 (23:46 +0100)]
Change form structure and add relevant CSS rules
Christopher Allan Webber [Sat, 19 Nov 2011 20:06:48 +0000 (14:06 -0600)]
Added back the title block