aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change adduser arguments from positional to --keyword style.Manuel Urbano Santos2011-12-031-5/+5
* Changed comment error message wording slightly. Btw, should we translate thes...Jef van Schendel2011-12-031-2/+2
* 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
* 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
| |\
| | * 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
| * | Merge remote branch 'remotes/manolinux/683_text_separate_tags_by_commas_and_s...Elrond2011-11-272-2/+2
| |\ \
| | * | Fix the text "Seperate tags by commas and spaces" since spaces are not used t...Manuel Urbano Santos2011-11-272-2/+2
* | | | 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
|\ \
| * | 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
* | | Add base class for MeddlewareElrond2011-11-254-14/+18
* | | 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 middle...Christopher Allan Webber2011-11-256-20/+20
* | | 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
| * | 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
| * | Fixes after merging video branch into masterJoar Wandborg2011-11-219-280/+90
| * | Merge branch 'video_gstreamer-only'Joar Wandborg2011-11-2125-32/+2993
| |\ \ | | |/ | |/|
| | * Refractored GStreamer element linkingJoar Wandborg2011-11-211-21/+22
| | * Stashing changesJoar Wandborg2011-11-218-65/+43
| | * Fixed video transcodingJoar Wandborg2011-11-161-212/+1
| | * Committing some futile attempts to make GStreamer transcode the audio properly.Joar Wandborg2011-11-151-7/+38
| | * moved from videoscale => ffvideoscale *and* put queus before video and audio ...Joar Wandborg2011-11-151-5/+13
| | * Minor fixesJoar Wandborg2011-11-012-2/+5
| | * Added pygtk to dependenciesJoar Wandborg2011-10-271-0/+1
| | * Added new thumbnailer, renamed old.Joar Wandborg2011-10-272-194/+474
| | * Image media exceptionsJoar Wandborg2011-10-151-29/+2
| | * Removed arista dependencyJoar Wandborg2011-10-141-1/+0
| | * Video transcoding is now gstreamer directly instead of through aristaJoar Wandborg2011-10-143-88/+135
| | * import_export - Added some error handlingJoar Wandborg2011-10-141-4/+6
| | * - Refractored the video thumbnailerJoar Wandborg2011-10-112-20/+303
| | * Fixed incorrect logger.[...] callsJoar Wandborg2011-10-062-5/+7
| | * Added parameter to transcoding_errorJoar Wandborg2011-10-051-2/+2
| | * Multimedia refractoring, and added video thumbnail supportJoar Wandborg2011-10-056-85/+213
| | * Renamed video.presets => video.devicesJoar Wandborg2011-09-294-0/+0
| | * Added arista to install requiresJoar Wandborg2011-09-281-0/+1
| | * Multimedia support - Refractored video processing.Joar Wandborg2011-09-248-66/+1875
| | * Multimedia support - Commiting from a not yet finished state - Details belowJoar Wandborg2011-09-2313-24/+650
* | | Rename MediaEntry.uploader() to .get_uploader()Elrond2011-11-228-19/+19