aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sql/dot-notation'Elrond2011-12-1224-130/+130
|\
| * Dot-Notation for MediaEntry.media_dataElrond2011-12-052-3/+3
| * Dot-Notation for MediaEntry.media_typeElrond2011-12-053-4/+4
| * Dot-Notation for MediaEntry.description(_html)Elrond2011-12-052-7/+7
| * Dot-Notation for MediaEntry.slugElrond2011-12-052-8/+8
| * Dot-Notation for MediaEntry.titleElrond2011-12-057-11/+11
| * Dot-Notation for MediaEntry.uploaderElrond2011-12-055-9/+9
| * Dot-Notation for MediaEntry.createdElrond2011-12-051-1/+1
| * Dot-Notation: tests/test_edit.pyElrond2011-12-051-4/+4
| * Dot-Notation for Users.fp_token_expireElrond2011-12-052-7/+7
| * Dot-Notation for Users.fp_verification_keyElrond2011-12-053-6/+6
| * Dot-Notation for Users.bio and .bio_htmlElrond2011-12-051-2/+2
| * Dot-Notation for Users.urlElrond2011-12-052-2/+2
| * Dot-Notation for Users.is_adminElrond2011-12-057-9/+9
| * Dot-Notation for Users.verification_keyElrond2011-12-053-5/+5
| * Dot-Notation for Users.statusElrond2011-12-055-10/+10
| * Dot-Notation for Users.email_verifiedElrond2011-12-053-7/+7
| * Dot-Notation for Users.pw_hashElrond2011-12-054-6/+6
| * Dot-Notation for Users.emailElrond2011-12-054-5/+5
| * Dot-Notation for Users.usernameElrond2011-12-0514-28/+28
* | Changer version to -devWill Kahn-Greene2011-12-121-1/+1
* | Update version numbersWill Kahn-Greene2011-12-121-1/+1
* | Updated translationsChristopher Allan Webber2011-12-1212-90/+100
* | Removed extraneous whitespace from video.htmlChristopher Allan Webber2011-12-121-1/+1
* | Allow administrators to disable keeping the original. That's the new default!Christopher Allan Webber2011-12-122-14/+20
* | Mark "newer/older" buttons for translationChristopher Allan Webber2011-12-121-4/+4
|/
* Update comment URLs to use the media slug.Christopher Allan Webber2011-12-051-1/+1
* Update the delete item to use the _id after all... it's the safest way.Christopher Allan Webber2011-12-054-5/+5
* Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instea...Christopher Allan Webber2011-12-044-7/+6
|\
| * Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinlora2011-11-19115-1161/+3757
| |\
| * | issue 582: use media.slug instead of media.idlora2011-11-193-5/+4
* | | Fix button word-wrapping issueChristopher Allan Webber2011-12-041-0/+1
* | | Compiled the .mo files tooChristopher Allan Webber2011-12-0420-0/+0
* | | 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