1615 Commits

Author SHA1 Message Date
Elrond
93e4622491 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.
2011-12-02 00:09:13 +01:00
Christopher Allan Webber
8e2af2843f Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-12-01 16:59:22 -06:00
Christopher Allan Webber
c7e1fee1b8 Should be 404 for 404s, not 400 :) 2011-12-01 16:58:56 -06:00
Elrond
9754802d4b 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.
2011-12-01 23:33:47 +01:00
Christopher Allan Webber
813be2938a Don't barf on templates that use the autoescaping extension 2011-12-01 15:21:15 -06:00
Elrond
72567762e3 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
2011-11-28 18:40:45 +01:00
Elrond
a3663b4079 Mark two strings for translation
1. "Go to page:" in pagination
2. "Submit" in the forget password form
2011-11-28 09:45:15 +01:00
Elrond
088c59545f 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.
2011-11-27 23:23:20 +01:00
Christopher Allan Webber
19e2668b77 Updating translations 2011-11-27 15:31:42 -06:00
Manuel Urbano Santos
9382221fe2 Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore. 2011-11-27 14:31:20 +01:00
Manuel Urbano Santos
d5bb51f9d4 * 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.
2011-11-27 13:55:07 +01:00
Manuel Urbano Santos
3038ba87e4 * 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.
2011-11-27 13:49:47 +01:00
Nathan Yergler
ca9ebfe2e0 Issue 680 Allow decorating views to prevent CSRF protection. 2011-11-26 15:32:35 -08:00
Nathan Yergler
91cf67385a Issue 680: Dispatch meddleware request processing post-routing 2011-11-26 14:34:36 -08:00
Elrond
e4113ad5b4 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
2011-11-26 13:50:06 +01:00
Elrond
5568a01419 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.
2011-11-26 11:50:25 +01:00
Elrond
56dc1c9d3e 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.
2011-11-25 22:16:18 +01:00
Christopher Allan Webber
1b7662012f Uncommenting requires=['gst'] till I figure out why Joar added it there :) 2011-11-25 12:33:34 -06:00
Christopher Allan Webber
ce5ae8da19 Rename MediaGoblin middleware to meddleware to avoid confusion w/ wsgi middleware
hehehehehe, "meddleware"
2011-11-25 12:13:56 -06:00
Christopher Allan Webber
4da6efb459 Removing these video javascript files, which are currently unused 2011-11-25 11:43:34 -06:00
Christopher Allan Webber
f47a7a8c92 Remove old enable_video config option 2011-11-25 11:42:03 -06:00
Christopher Allan Webber
cfa96da734 Load multiple media types based on the media_types section of the config file 2011-11-25 11:41:24 -06:00
Christopher Allan Webber
99d2ac1d83 Merge remote-tracking branch 'remotes/jwandborg/master' 2011-11-24 15:24:58 -06:00
Elrond
3018832153 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()
2011-11-22 22:29:37 +01:00
Elrond
4d4e5b435b 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!
2011-11-22 22:00:04 +01:00
Elrond
ea33f63635 Wrap long line.
Nothing else.
2011-11-22 21:48:56 +01:00
Pablo J. Urbano Santos
56bfd91ab4 Added a message noticing the user the image has been successfully
deleted.
2011-11-22 21:07:09 +01:00
Joar Wandborg
6506b1e22c Fixes for video branch
- Removed superfluous code from media_types.image
- Updated lazy_pass_to_ugettext imports
2011-11-22 21:06:08 +01:00
Pablo J. Urbano Santos
d0ba62e2e7 Fixes #597. Add a visible error when user tries to delete an image
without cheking the "I'm sure" checkbox.
2011-11-22 20:29:33 +01:00
Joar Wandborg
8aeb673877 Video support is disabled by default, set enable_video to true to enable 2011-11-22 00:09:41 +01:00
Joar Wandborg
0bce749b21 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
2011-11-21 23:38:31 +01:00
Joar Wandborg
8e5f974684 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
2011-11-21 23:18:40 +01:00
Pablo J. Urbano Santos
58dd8d9e63 Filename extensions are lowercased before uploading the image. 2011-11-21 22:42:55 +01:00
Joar Wandborg
b9e1fa280e Merge branch 'video_gstreamer-only'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
Joar Wandborg
c875bb74a8 Refractored GStreamer element linking 2011-11-21 21:47:00 +01:00
Christopher Allan Webber
e56e5f8c5c Tests for StorageInterface*.copy_local_to_storage() 2011-11-20 22:25:22 -06:00
Christopher Allan Webber
61c5306d24 Made the image processing use intermediary conversion file.
This should fix the problem with PIL and the cloudfiles storage system
fighting.
2011-11-20 22:12:51 -06:00
Christopher Allan Webber
2e8fbc8fab Slightly clearer docs on copy_local_to_storage 2011-11-20 22:02:02 -06:00
Christopher Allan Webber
98f6efb068 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.
2011-11-20 22:01:43 -06:00
Joar Wandborg
a63b640f12 Stashing changes 2011-11-21 00:06:59 +01:00
Jakob Kramer
fe0a8f53e2 fixed identation 2011-11-20 21:40:51 +01:00
Jakob Kramer
a00f1c1e1c eyecandy for programmers 2011-11-20 21:30:46 +01:00
Jakob Kramer
9404a9fed2 don't use 'and' anymore, if there is only one tag 2011-11-20 21:15:07 +01:00
Elrond
5dbeda8a0f 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".
2011-11-20 20:15:21 +01:00
Elrond
e51af0e620 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
2011-11-20 20:00:08 +01:00
Jef van Schendel
0b3cdd6a25 Navigation buttons edits. Removed images as they are no longer needed. Related: bug #504 2011-11-20 17:01:23 +01:00
Jef van Schendel
7807f5a513 Remove Edit/Delete icons, since they are not required yet. 2011-11-20 16:45:45 +01:00
Jef van Schendel
16a444444a Change tag list from a list to a paragraph. Wrap text for translation. 2011-11-20 16:18:27 +01:00
Jef van Schendel
cee794a8f7 Fix for bug #467, "Add explanatory copy to add/edit picture pages saying that tags are comma-separated" 2011-11-20 15:34:40 +01:00
Jef van Schendel
88f20b58b2 Slight style changes to button_action_highlight 2011-11-20 01:57:29 +01:00