aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DOCS: update to deployment documentation and new production deployments doctycho garen2011-12-042-5/+53
|
* Merge branch 'misc/fixture_add_user'Elrond2011-12-044-32/+26
|\ | | | | | | | | * misc/fixture_add_user: fixture_add_user: Factoring a unit test tool
| * fixture_add_user: Factoring a unit test toolElrond2011-12-014-32/+26
| | | | | | | | | | | | | | 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.
* | Most users won't see this but having space after prompt still nice for ↵Christopher Allan Webber2011-12-031-1/+1
| | | | | | | | passwords.
* | PEP-8'ifying prompt_if_not_setChristopher Allan Webber2011-12-031-3/+3
| |
* | Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt'Christopher Allan Webber2011-12-032-6/+22
|\ \
| * | Prompt for arguments in adduser if not present (I created a function in ↵Manuel Urbano Santos2011-12-032-1/+17
| | | | | | | | | | | | util.py to check and prompt for arguments).
| * | Change adduser arguments from positional to --keyword style.Manuel Urbano Santos2011-12-031-5/+5
| | |
* | | Raise a slightly useful exception when we can't find the media type.Christopher Allan Webber2011-12-031-0/+4
| | |
* | | Updated translationsChristopher Allan Webber2011-12-0341-319/+1056
| | |
* | | Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'Elrond2011-12-034-12/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | * 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.
| * | | * Feature #678: Drop custom delimiters in tagsManuel Urbano Santos2011-11-272-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ↵Manuel Urbano Santos2011-11-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Bug #685: only provide CSRF token if it existsElrond2011-12-032-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Bug #685: Add failing unit testElrond2011-12-031-0/+26
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Changed comment error message wording slightly. Btw, should we translate ↵Jef van Schendel2011-12-031-2/+2
| | | | | | | | | | | | these things?
* | | We should use the variable local_templates instead of user_template_pathChristopher Allan Webber2011-12-021-1/+1
| | |
* | | Expect 404 in unit tests, if we now use 404.Elrond2011-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-12-019-17/+47
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'remotes/nyergler/issue-680-csrf-optout'Elrond2011-11-285-13/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | * remotes/nyergler/issue-680-csrf-optout: Issue 680 Allow decorating views to prevent CSRF protection. Issue 680: Dispatch meddleware request processing post-routing
| | * | Issue 680 Allow decorating views to prevent CSRF protection.Nathan Yergler2011-11-262-4/+32
| | | |
| | * | Issue 680: Dispatch meddleware request processing post-routingNathan Yergler2011-11-264-9/+11
| | | |
| * | | Mark two strings for translationElrond2011-11-282-2/+2
| | | | | | | | | | | | | | | | | | | | 1. "Go to page:" in pagination 2. "Submit" in the forget password form
| * | | Merge remote branch ↵Elrond2011-11-272-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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.
| | * | | Fix the text "Seperate tags by commas and spaces" since spaces are not used ↵Manuel Urbano Santos2011-11-272-2/+2
| | | |/ | | |/| | | | | | | | | to seperate anymore.
* | | | Should be 404 for 404s, not 400 :)Christopher Allan Webber2011-12-011-1/+1
| | | |
* | | | Don't barf on templates that use the autoescaping extensionChristopher Allan Webber2011-12-011-0/+3
|/ / /
* | / Updating translationsChristopher Allan Webber2011-11-2721-2572/+3125
| |/ |/|
* | Merge remote branch 'remotes/inconexo/588_lowercase_extension'Elrond2011-11-261-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Filename extensions are lowercased before uploading the image.Pablo J. Urbano Santos2011-11-211-2/+5
| | |
* | | Use setup_global_and_app_config in gmg's migrate.Elrond2011-11-261-3/+3
| | | | | | | | | | | | | | | | | | 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.
* | | Add base class for MeddlewareElrond2011-11-254-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Uncommenting requires=['gst'] till I figure out why Joar added it there :)Christopher Allan Webber2011-11-251-1/+1
| | |
* | | Rename MediaGoblin middleware to meddleware to avoid confusion w/ wsgi ↵Christopher Allan Webber2011-11-256-20/+20
| | | | | | | | | | | | | | | | | | middleware hehehehehe, "meddleware"
* | | Removing these video javascript files, which are currently unusedChristopher Allan Webber2011-11-251-5/+0
| | |
* | | Remove old enable_video config optionChristopher Allan Webber2011-11-251-2/+0
| | |
* | | Load multiple media types based on the media_types section of the config fileChristopher Allan Webber2011-11-253-13/+9
| | |
* | | Merge remote-tracking branch 'remotes/jwandborg/master'Christopher Allan Webber2011-11-2429-226/+2964
|\ \ \ | |_|/ |/| |
| * | Fixes for video branchJoar Wandborg2011-11-224-47/+5
| | | | | | | | | | | | | | | - Removed superfluous code from media_types.image - Updated lazy_pass_to_ugettext imports
| * | Video support is disabled by default, set enable_video to true to enableJoar Wandborg2011-11-222-2/+8
| | |
| * | Fixes after merging video into master - part 2Joar Wandborg2011-11-213-71/+74
| | | | | | | | | | | | | | | | | | - Added handling of InvalidFileType to submit.views - Updated test_celery_setup and test_submission tests to reflect the changes to the media procesing infrastructure
| * | Fixes after merging video branch into masterJoar Wandborg2011-11-219-280/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | Merge branch 'video_gstreamer-only'Joar Wandborg2011-11-2125-32/+2993
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
| | * Refractored GStreamer element linkingJoar Wandborg2011-11-211-21/+22
| | |
| | * Stashing changesJoar Wandborg2011-11-218-65/+43
| | |
| | * Fixed video transcodingJoar Wandborg2011-11-161-212/+1
| | | | | | | | | | | | | | | - Added audiorate with tolerance 80 million - Removed deprecated thumbnailer
| | * Committing some futile attempts to make GStreamer transcode the audio properly.Joar Wandborg2011-11-151-7/+38
| | | | | | | | | | | | | | | | | | - Added CPU count detection - Added videorate - Added audiorate
| | * moved from videoscale => ffvideoscale *and* put queus before video and audio ↵Joar Wandborg2011-11-151-5/+13
| | | | | | | | | | | | pipes
| | * Minor fixesJoar Wandborg2011-11-012-2/+5
| | | | | | | | | | | | | | | - Added error handling for PyGTK import - Added 'mkv' to the video media manager
| | * Added pygtk to dependenciesJoar Wandborg2011-10-271-0/+1
| | |