aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated translationsChristopher Allan Webber2011-12-0421-386/+371
* Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-12-044-32/+26
|\
| * Merge branch 'misc/fixture_add_user'Elrond2011-12-044-32/+26
| |\
| | * fixture_add_user: Factoring a unit test toolElrond2011-12-014-32/+26
* | | Removing the conditional that checks if there's a media in media.htmlChristopher Allan Webber2011-12-041-125/+121
* | | Change "Your finest source of goblin related media" to something elseChristopher Allan Webber2011-12-041-1/+1
|/ /
* | Most users won't see this but having space after prompt still nice for passwo...Christopher Allan Webber2011-12-031-1/+1
* | 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 util....Manuel Urbano Santos2011-12-032-1/+17
| * | 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
|\ \ \
| * | | * Feature #678: Drop custom delimiters in tagsManuel Urbano Santos2011-11-272-9/+1
| * | | * Bug #671: Tags list on Edit page is not seperated by spaces and hard to rea...Manuel Urbano Santos2011-11-272-3/+3
* | | | Bug #685: only provide CSRF token if it existsElrond2011-12-032-1/+6
* | | | Bug #685: Add failing unit testElrond2011-12-031-0/+26
| |/ / |/| |
* | | 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