Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change adduser arguments from positional to --keyword style. | Manuel Urbano Santos | 2011-12-03 | 1 | -5/+5 |
| | |||||
* | Changed comment error message wording slightly. Btw, should we translate ↵ | Jef van Schendel | 2011-12-03 | 1 | -2/+2 |
| | | | | these things? | ||||
* | We should use the variable local_templates instead of user_template_path | Christopher Allan Webber | 2011-12-02 | 1 | -1/+1 |
| | |||||
* | Expect 404 in unit tests, if we now use 404. | Elrond | 2011-12-02 | 1 | -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/mediagoblin | Christopher Allan Webber | 2011-12-01 | 9 | -17/+47 |
|\ | |||||
| * | Merge remote branch 'remotes/nyergler/issue-680-csrf-optout' | Elrond | 2011-11-28 | 5 | -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 Yergler | 2011-11-26 | 2 | -4/+32 |
| | | | |||||
| | * | Issue 680: Dispatch meddleware request processing post-routing | Nathan Yergler | 2011-11-26 | 4 | -9/+11 |
| | | | |||||
| * | | Mark two strings for translation | Elrond | 2011-11-28 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | 1. "Go to page:" in pagination 2. "Submit" in the forget password form | ||||
| * | | Merge remote branch ↵ | Elrond | 2011-11-27 | 2 | -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 Santos | 2011-11-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | to seperate anymore. | ||||
* | | | | Should be 404 for 404s, not 400 :) | Christopher Allan Webber | 2011-12-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Don't barf on templates that use the autoescaping extension | Christopher Allan Webber | 2011-12-01 | 1 | -0/+3 |
|/ / / | |||||
* | / | Updating translations | Christopher Allan Webber | 2011-11-27 | 21 | -2572/+3125 |
| |/ |/| | |||||
* | | Merge remote branch 'remotes/inconexo/588_lowercase_extension' | Elrond | 2011-11-26 | 1 | -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 Santos | 2011-11-21 | 1 | -2/+5 |
| | | | |||||
* | | | Use setup_global_and_app_config in gmg's migrate. | Elrond | 2011-11-26 | 1 | -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 Meddleware | Elrond | 2011-11-25 | 4 | -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 Webber | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
* | | | Rename MediaGoblin middleware to meddleware to avoid confusion w/ wsgi ↵ | Christopher Allan Webber | 2011-11-25 | 6 | -20/+20 |
| | | | | | | | | | | | | | | | | | | middleware hehehehehe, "meddleware" | ||||
* | | | Removing these video javascript files, which are currently unused | Christopher Allan Webber | 2011-11-25 | 1 | -5/+0 |
| | | | |||||
* | | | Remove old enable_video config option | Christopher Allan Webber | 2011-11-25 | 1 | -2/+0 |
| | | | |||||
* | | | Load multiple media types based on the media_types section of the config file | Christopher Allan Webber | 2011-11-25 | 3 | -13/+9 |
| | | | |||||
* | | | Merge remote-tracking branch 'remotes/jwandborg/master' | Christopher Allan Webber | 2011-11-24 | 29 | -226/+2964 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fixes for video branch | Joar Wandborg | 2011-11-22 | 4 | -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 enable | Joar Wandborg | 2011-11-22 | 2 | -2/+8 |
| | | | |||||
| * | | Fixes after merging video into master - part 2 | Joar Wandborg | 2011-11-21 | 3 | -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 master | Joar Wandborg | 2011-11-21 | 9 | -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 Wandborg | 2011-11-21 | 25 | -32/+2993 |
| |\ \ | | |/ | |/| | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py | ||||
| | * | Refractored GStreamer element linking | Joar Wandborg | 2011-11-21 | 1 | -21/+22 |
| | | | |||||
| | * | Stashing changes | Joar Wandborg | 2011-11-21 | 8 | -65/+43 |
| | | | |||||
| | * | Fixed video transcoding | Joar Wandborg | 2011-11-16 | 1 | -212/+1 |
| | | | | | | | | | | | | | | | - Added audiorate with tolerance 80 million - Removed deprecated thumbnailer | ||||
| | * | Committing some futile attempts to make GStreamer transcode the audio properly. | Joar Wandborg | 2011-11-15 | 1 | -7/+38 |
| | | | | | | | | | | | | | | | | | | - Added CPU count detection - Added videorate - Added audiorate | ||||
| | * | moved from videoscale => ffvideoscale *and* put queus before video and audio ↵ | Joar Wandborg | 2011-11-15 | 1 | -5/+13 |
| | | | | | | | | | | | | pipes | ||||
| | * | Minor fixes | Joar Wandborg | 2011-11-01 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | - Added error handling for PyGTK import - Added 'mkv' to the video media manager | ||||
| | * | Added pygtk to dependencies | Joar Wandborg | 2011-10-27 | 1 | -0/+1 |
| | | | |||||
| | * | Added new thumbnailer, renamed old. | Joar Wandborg | 2011-10-27 | 2 | -194/+474 |
| | | | |||||
| | * | Image media exceptions | Joar Wandborg | 2011-10-15 | 1 | -29/+2 |
| | | | | | | | | | | | | - Removed exception types specified in image.processing and included them from process_media.errors instead | ||||
| | * | Removed arista dependency | Joar Wandborg | 2011-10-14 | 1 | -1/+0 |
| | | | |||||
| | * | Video transcoding is now gstreamer directly instead of through arista | Joar Wandborg | 2011-10-14 | 3 | -88/+135 |
| | | | |||||
| | * | import_export - Added some error handling | Joar Wandborg | 2011-10-14 | 1 | -4/+6 |
| | | | | | | | | | | | | We still want to be able to do an export if a file can't be read | ||||
| | * | - Refractored the video thumbnailer | Joar Wandborg | 2011-10-11 | 2 | -20/+303 |
| | | | | | | | | | | | | | | | | | | - Started work on video transcoder Not done, by far! - Bug fix in video.processing error handling | ||||
| | * | Fixed incorrect logger.[...] calls | Joar Wandborg | 2011-10-06 | 2 | -5/+7 |
| | | | | | | | | | | | | - Added FIXME about thumb size | ||||
| | * | Added parameter to transcoding_error | Joar Wandborg | 2011-10-05 | 1 | -2/+2 |
| | | | |||||
| | * | Multimedia refractoring, and added video thumbnail support | Joar Wandborg | 2011-10-05 | 6 | -85/+213 |
| | | | |||||
| | * | Renamed video.presets => video.devices | Joar Wandborg | 2011-09-29 | 4 | -0/+0 |
| | | | |||||
| | * | Added arista to install requires | Joar Wandborg | 2011-09-28 | 1 | -0/+1 |
| | | | |||||
| | * | Multimedia support - Refractored video processing. | Joar Wandborg | 2011-09-24 | 8 | -66/+1875 |
| | | | |||||
| | * | Multimedia support - Commiting from a not yet finished state - Details below | Joar Wandborg | 2011-09-23 | 13 | -24/+650 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DONE Initially testing with arista ** DONE Video display templates *** TODO Multi-browser support ** TODO Video thumbnails ** TODO Link to original video ** TODO Video cropping Also contains a lot of "debug" print's | ||||
* | | | Rename MediaEntry.uploader() to .get_uploader() | Elrond | 2011-11-22 | 8 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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() |