aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-0410-2/+203
|\
| * Title first and foremost... anything else looks weird to me.Christopher Allan Webber2011-06-031-2/+2
| * Merge branch 'media_edit'Christopher Allan Webber2011-06-039-0/+200
| |\
| | * Find out if such a slug exists via a query instead of via a .save() callChristopher Allan Webber2011-06-031-12/+19
| | * Add GNU headers to new *.pyElrond2011-06-022-0/+31
| | * Handle Exceptions from save(); Move may_edit_mediaElrond2011-06-022-10/+13
| | * Prepare for moving /edit/ under /u/.../edit/Elrond2011-06-024-3/+5
| | * Change edit form to use divs instead of tableElrond2011-06-021-7/+6
| | * Merge remote branch 'upstream/master'Elrond2011-06-0218-133/+339
| | |\
| | * | Check for edit permission.Elrond2011-06-021-0/+13
| | * | "edit": Finally implement saving.Elrond2011-05-271-1/+12
| | * | Use new button styleElrond2011-05-261-1/+1
| | * | Starting "edit" functionality.Elrond2011-05-268-0/+135
| * | | Propagate Exceptions up in Celery-Eager-ModeElrond2011-06-031-0/+1
* | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-033-48/+40
|\| | |
| * | | Refactored the sending of verification emails.Aleksandar Micovic2011-06-022-45/+39
| * | | attribute values should be quoted :)Christopher Allan Webber2011-06-021-1/+1
| * | | No reason for 'verification_successful = bool' here.Christopher Allan Webber2011-06-021-2/+0
* | | | Added lines background to formsJef van Schendel2011-06-021-2/+3
* | | | Right-aligned input buttons, added gradientJef van Schendel2011-06-021-13/+22
* | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-026-9/+137
|\| | |
| * | | No need for a method for generating the verification key as a methodChristopher Allan Webber2011-06-022-10/+4
| * | | Elrond put that ObjectId thing in the db.util module and wants us toChristopher Allan Webber2011-06-021-2/+2
| | |/ | |/|
| * | 0.0.2 of GNU MediaGoblin!Christopher Allan Webber2011-05-311-2/+2
| * | If a user doesn't provide a userid and a token to the verify_email function, ...Christopher Allan Webber2011-05-311-2/+6
| * | Moving import to outside of this functionChristopher Allan Webber2011-05-311-1/+1
| * | Just adjusting some spacing so we don't go over 80 charsChristopher Allan Webber2011-05-311-2/+4
| * | Give a "proper" view for resending verification emailChristopher Allan Webber2011-05-313-7/+37
| * | Merge remote branch 'remotes/aleks/aleks'Christopher Allan Webber2011-05-315-4/+102
| |\ \
| | * | Added the ability to regenerate a verification key.Aleksandar Micovic2011-05-314-2/+53
| | * | Fixed bug where someone who wasn't logged in was asked to verifyAleksandar Micovic2011-05-311-4/+5
| | * | Added a temporary verification page informing the user they needAleksandar Micovic2011-05-304-2/+48
* | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-05-311-6/+5
|\| | |
| * | | Add an index on MediaEntries making sure slugs + uploader combos are uniqueChristopher Allan Webber2011-05-301-6/+5
| |/ /
* / / Improved object_gallery.html spacingJef van Schendel2011-05-312-10/+13
|/ /
* | Use the object gallery file on the front page alsoChristopher Allan Webber2011-05-291-9/+1
* | This <ul /> not used (second inside), removingChristopher Allan Webber2011-05-291-4/+1
* | remove all 'username_repr' stuffJakob Kramer2011-05-294-6/+4
* | don't import 're'Jakob Kramer2011-05-291-2/+0
* | this should fix #354Jakob Kramer2011-05-294-7/+13
* | First changes to media gallery viewJef van Schendel2011-05-292-1/+13
* | Slightly modified text on media pageJef van Schendel2011-05-291-12/+5
* | Centered image on media pageJef van Schendel2011-05-292-11/+17
* | Modified logo to change on :hoverJef van Schendel2011-05-293-4/+12
* | Changed submit form to divsJef van Schendel2011-05-292-8/+11
* | Changed <p> font from 'sans' to 'sans-serif'Joar Wandborg2011-05-281-1/+1
* | Changed <body> font from 'sans' to 'sans-serif'Joar Wandborg2011-05-281-1/+1
* | Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-...Joar Wandborg2011-05-285-69/+105
|\ \
| * | Fixed submit button style, added create-account notice to log in pageJef van Schendel2011-05-282-2/+7
| * | Forgot a bottom-margin for the error divJef van Schendel2011-05-281-0/+1