aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge jQuery branch, resolve conflictsJef van Schendel2011-12-1313-99/+167
|\
| * Style changes for media_uploader (now media_specs); removed margins from butt...Jef van Schendel2011-12-102-17/+15
| * Remove pagination images and replace them with unicode charactersJef van Schendel2011-12-103-4/+2
| * Change wording in tags.htmlJef van Schendel2011-12-091-2/+2
| * Open Markdown link in new windows; I know _blank is sometimes frowned upon bu...Jef van Schendel2011-12-091-1/+1
| * Only apply textarea style to comment boxJef van Schendel2011-12-091-6/+3
| * Lots of changes to media page; rearranged things, added new styles, added jqu...Jef van Schendel2011-12-093-41/+69
| * Move author text, "By X", to the sidebarJef van Schendel2011-12-071-6/+9
| * Add show-password checkbox and make it workJef van Schendel2011-12-023-10/+23
| * First push with jQuery libraryJef van Schendel2011-12-023-0/+25
* | 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-122-3/+3
* | | Update version numbersWill Kahn-Greene2011-12-122-3/+3
* | | Fix doc footerWill Kahn-Greene2011-12-126-372/+38
* | | Tweak rest formattingWill Kahn-Greene2011-12-121-4/+4
* | | Updated translationsChristopher Allan Webber2011-12-1212-90/+100
* | | Added the "Media types" chapterChristopher Allan Webber2011-12-122-0/+35
* | | Doc updatesWill Kahn-Greene2011-12-124-132/+142
* | | Add some documentation to lazyserver.shWill Kahn-Greene2011-12-121-0/+4
* | | Update READMEWill Kahn-Greene2011-12-121-9/+8
* | | Tweak runtests to be more helpfulWill Kahn-Greene2011-12-121-1/+2
* | | Removed extraneous whitespace from video.htmlChristopher Allan Webber2011-12-121-1/+1
* | | Add a note on how to up the upload size limitChristopher Allan Webber2011-12-121-0/+3
* | | 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
* | Cloudfiles not actually a dependency, removing from setup.pyChristopher Allan Webber2011-12-041-1/+0
* | 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-19126-1184/+4193
| |\ \
| * | | issue 582: use media.slug instead of media.idlora2011-11-193-5/+4