aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added reset.css and text.css from 960.gs. This might shake up a few styles!Jef van Schendel2011-07-035-0/+294
* Put file input form at the top of submission formJef van Schendel2011-07-031-3/+2
* Merge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit'Christopher Allan Webber2011-07-031-1/+5
|\
| * Feature #409 - Submitting an image should redirect you back to user'sJoar Wandborg2011-07-031-1/+5
* | class="media_image" accidentally added back during 400 merge. Fixing.Christopher Allan Webber2011-07-031-4/+4
* | Switching single-quoted strings to double-quote to avoid escaping the apostro...Christopher Allan Webber2011-07-031-2/+2
* | Caution an admin when they're editing someone else's media.Christopher Allan Webber2011-07-031-0/+8
* | user_gallery_url -> {{ user_gallery_url }} ... How embarassing.Christopher Allan Webber2011-07-031-1/+1
* | Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_u...Christopher Allan Webber2011-07-035-6/+23
|\ \
| * | uses new 'username' variable in querystring to specify the user to editCaleb Forbes Davis V2011-07-032-4/+17
| * | allows admins to edit user mediaCaleb Forbes Davis V2011-07-031-1/+2
| * | moves edit profile link to user pageCaleb Forbes Davis V2011-07-032-1/+4
* | | Make pagination on user profile point to the user galleryChristopher Allan Webber2011-07-025-30/+59
* | | Just some spacing changes in profile.htmlChristopher Allan Webber2011-07-021-8/+8
* | | We should link to the user's gallery, not the logged in person's gallery.Christopher Allan Webber2011-07-021-2/+1
|/ /
* | Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'Christopher Allan Webber2011-07-024-2/+74
|\ \
| * | adds previous and next links in the sidebarCaleb Forbes Davis V2011-07-024-2/+74
| |/
* | Let users write their own config and paste files w/o affecting gitChristopher Allan Webber2011-07-021-0/+1
* | Merge remote branch 'remotes/elrond/idea/lazyserver'Christopher Allan Webber2011-07-021-1/+18
|\ \
| * | Improve lazyserver.sh to handle argsElrond2011-07-031-1/+18
* | | Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'Christopher Allan Webber2011-07-022-13/+33
|\ \ \ | |/ / |/| |
| * | Feature #400 - Resize images to fit on pageJoar Wandborg2011-07-032-13/+32
| * | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-07-018-91/+113
| |\|
* | | Only show pagination if we have pages to showChristopher Allan Webber2011-07-021-2/+2
* | | Issue 406: media_details template deprecated. Removing!Christopher Allan Webber2011-07-021-37/+0
* | | Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix'Christopher Allan Webber2011-07-021-1/+5
|\ \ \
| * | | Bug #404 - Successful profile edit is successful!Caleb Forbes Davis V2011-07-011-1/+5
| | |/ | |/|
* | | Note from Chris Webber prefacing Elrond's DB abstraction idea.Christopher Allan Webber2011-07-021-0/+12
* | | Merge remote branch 'remotes/elrond/idea/db_doc'Christopher Allan Webber2011-07-021-0/+34
|\ \ \
| * | | Document the db submodule a bitElrond2011-06-301-0/+34
* | | | Merge remote branch 'remotes/elrond/dev/init'Christopher Allan Webber2011-07-0214-33/+51
|\ \ \ \
| * | | | Move config.py to init/Elrond2011-07-025-4/+4
| * | | | Move get_jinja_loader to init submodule.Elrond2011-07-023-17/+20
| * | | | Move mediagoblin.celery_setup -> mediagoblin.init.celeryElrond2011-07-0210-12/+12
| * | | | Start mediagoblin.initElrond2011-07-021-0/+15
| | |/ / | |/| |
* | | | Merge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_fe...Christopher Allan Webber2011-07-023-22/+13
|\ \ \ \
| * | | | Issue #362 - Simple comments - Changes based on feedback recieved from #media...Joar Wandborg2011-07-013-22/+13
| | |_|/ | |/| |
| * | | Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-06-307-8/+169
| |\ \ \
| * \ \ \ Merge branch 'feature_362-simple_comments'Joar Wandborg2011-06-295-11/+158
| |\ \ \ \
* | | | | | Removing that 'temporarily, an "image gallery" that isn't one really ;)' textChristopher Allan Webber2011-07-021-1/+0
* | | | | | the delete text should be flush against the image since the edit text isChristopher Allan Webber2011-07-021-2/+1
* | | | | | More spacing / newline changes to media.htmlChristopher Allan Webber2011-07-021-4/+8
* | | | | | Not sure what these fields are here commented out for... removingChristopher Allan Webber2011-07-021-4/+1
* | | | | | Cleaning up some indentation in media.htmlChristopher Allan Webber2011-07-021-5/+13
* | | | | | images/iconFoo.png filenames -> icon/icon_foo.pngChristopher Allan Webber2011-07-024-2/+2
* | | | | | Merge remote branch 'remotes/schendje/master'Christopher Allan Webber2011-07-026-53/+64
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Tiny pagination style changesJef van Schendel2011-07-012-1/+6
| * | | | | Remove dotted_line style from cssJef van Schendel2011-07-011-9/+0
| * | | | | Fix tiny pagination error: missing end tagJef van Schendel2011-07-011-2/+2
| * | | | | Remove strong style from paginationJef van Schendel2011-07-011-1/+1