Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Put file input form at the top of submission form | Jef van Schendel | 2011-07-03 | 1 | -3/+2 |
| | |||||
* | Merge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit' | Christopher Allan Webber | 2011-07-03 | 1 | -1/+5 |
|\ | |||||
| * | Feature #409 - Submitting an image should redirect you back to user's | Joar Wandborg | 2011-07-03 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | page w/ a message * Successful submission redirects to the logged in user's page (your own, presumably). * "Woohoo! Submitted!" is launched into the tube of session messages to appear on next pageload. If you're not aborting in the window of 210ms it takes for the client to respond to the 302 and load the logged in user's/your page that is, YMMV. | ||||
* | | class="media_image" accidentally added back during 400 merge. Fixing. | Christopher Allan Webber | 2011-07-03 | 1 | -4/+4 |
| | | |||||
* | | Switching single-quoted strings to double-quote to avoid escaping the ↵ | Christopher Allan Webber | 2011-07-03 | 1 | -2/+2 |
| | | | | | | | | apostrophe.. :) | ||||
* | | Caution an admin when they're editing someone else's media. | Christopher Allan Webber | 2011-07-03 | 1 | -0/+8 |
| | | |||||
* | | user_gallery_url -> {{ user_gallery_url }} ... How embarassing. | Christopher Allan Webber | 2011-07-03 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch ↵ | Christopher Allan Webber | 2011-07-03 | 5 | -6/+23 |
|\ \ | | | | | | | | | | 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page' | ||||
| * | | uses new 'username' variable in querystring to specify the user to edit | Caleb Forbes Davis V | 2011-07-03 | 2 | -4/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this view only allowed editing of the logged-in user. Now you can specify the user to edit in the querystring. If you are an admin the view allows you to edit any user's profile, with a warning message. The warning only shows up if the admin is editing another user's profile. Make sure to pass the username to this view at every step in the process | ||||
| * | | allows admins to edit user media | Caleb Forbes Davis V | 2011-07-03 | 1 | -1/+2 |
| | | | |||||
| * | | moves edit profile link to user page | Caleb Forbes Davis V | 2011-07-03 | 2 | -1/+4 |
| | | | |||||
* | | | Make pagination on user profile point to the user gallery | Christopher Allan Webber | 2011-07-02 | 5 | -30/+59 |
| | | | | | | | | | | | | | | | | | | This required a couple of changes: - making a new render_pagination macro - switching things over to use that | ||||
* | | | Just some spacing changes in profile.html | Christopher Allan Webber | 2011-07-02 | 1 | -8/+8 |
| | | | |||||
* | | | We should link to the user's gallery, not the logged in person's gallery. | Christopher Allan Webber | 2011-07-02 | 1 | -2/+1 |
|/ / | |||||
* | | Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav' | Christopher Allan Webber | 2011-07-02 | 4 | -2/+74 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/models.py mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | | adds previous and next links in the sidebar | Caleb Forbes Davis V | 2011-07-02 | 4 | -2/+74 |
| |/ | | | | | | | | | | | | | | | Feature #401 - previous/next navigation on media pages * media.html includes a new prev_next.html template containing the links * prev_next.html calls functions added to the media model to retrieve the appropriate objects from the database, formatted with urlgen * a small change to util.py brings ASCENDING into the mix | ||||
* | | Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page' | Christopher Allan Webber | 2011-07-02 | 2 | -13/+33 |
|\ \ | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | | Feature #400 - Resize images to fit on page | Joar Wandborg | 2011-07-03 | 2 | -13/+32 |
| |/ | | | | | | | | | | | | | | | | | | | * `mediagoblin.process_media.__init__` * Added `medium` size image conversion * Updated `thumbnail` conversion to use `queued_filename` instead of `queued_file` * `media.html` * If there exists a `medium` size for the `MediaEntry`, it will display instead of the original `main` image. | ||||
* | | Only show pagination if we have pages to show | Christopher Allan Webber | 2011-07-02 | 1 | -2/+2 |
| | | |||||
* | | Issue 406: media_details template deprecated. Removing! | Christopher Allan Webber | 2011-07-02 | 1 | -37/+0 |
| | | |||||
* | | Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix' | Christopher Allan Webber | 2011-07-02 | 1 | -1/+5 |
|\ \ | |||||
| * | | Bug #404 - Successful profile edit is successful! | Caleb Forbes Davis V | 2011-07-01 | 1 | -1/+5 |
| |/ | | | | | | | user is notified of successful profile edit w/o extra navigation | ||||
* | | Note from Chris Webber prefacing Elrond's DB abstraction idea. | Christopher Allan Webber | 2011-07-02 | 1 | -0/+12 |
| | | |||||
* | | Merge remote branch 'remotes/elrond/idea/db_doc' | Christopher Allan Webber | 2011-07-02 | 1 | -0/+34 |
|\ \ | |||||
| * | | Document the db submodule a bit | Elrond | 2011-06-30 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | Document the ideas behind the db submodule. And document what that actually means. | ||||
* | | | Merge remote branch 'remotes/elrond/dev/init' | Christopher Allan Webber | 2011-07-02 | 12 | -31/+49 |
|\ \ \ | |||||
| * | | | Move config.py to init/ | Elrond | 2011-07-02 | 5 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some simple changes needed to do that. The interesting question left: Should config_spec.ini also be moved? | ||||
| * | | | Move get_jinja_loader to init submodule. | Elrond | 2011-07-02 | 3 | -17/+20 |
| | | | | |||||
| * | | | Move mediagoblin.celery_setup -> mediagoblin.init.celery | Elrond | 2011-07-02 | 8 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | As the first target of the new .init. submodule move celery_setup there. Quite straight forward, just a lot of places to change. | ||||
| * | | | Start mediagoblin.init | Elrond | 2011-07-02 | 1 | -0/+15 |
| | |/ | |/| | |||||
* | | | Merge remote branch ↵ | Christopher Allan Webber | 2011-07-02 | 3 | -22/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback' Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | | | Issue #362 - Simple comments - Changes based on feedback recieved from ↵ | Joar Wandborg | 2011-07-01 | 3 | -22/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #mediagoblin * `db.models` - Removed `MediaEntry.get_comments()` and replaced it with a helper which just returns a cursor for the comments query * `media.html` - Added `{% set comment_author = comment.author() %}` * `user_pages.views` - media_home() now passes `MediaEntry.get_comments()` directly to `Pagination`, handles pagination for comments. * Added `MEDIA_COMMENTS_PER_PAGE` to define the number of comments per page in the `media_home()` view. | ||||
* | | | | Removing that 'temporarily, an "image gallery" that isn't one really ;)' text | Christopher Allan Webber | 2011-07-02 | 1 | -1/+0 |
| | | | | |||||
* | | | | the delete text should be flush against the image since the edit text is | Christopher Allan Webber | 2011-07-02 | 1 | -2/+1 |
| | | | | |||||
* | | | | More spacing / newline changes to media.html | Christopher Allan Webber | 2011-07-02 | 1 | -4/+8 |
| | | | | |||||
* | | | | Not sure what these fields are here commented out for... removing | Christopher Allan Webber | 2011-07-02 | 1 | -4/+1 |
| | | | | |||||
* | | | | Cleaning up some indentation in media.html | Christopher Allan Webber | 2011-07-02 | 1 | -5/+13 |
| | | | | |||||
* | | | | images/iconFoo.png filenames -> icon/icon_foo.png | Christopher Allan Webber | 2011-07-02 | 4 | -2/+2 |
| | | | | | | | | | | | | | | | | I have a thing against mixedCase :) | ||||
* | | | | Merge remote branch 'remotes/schendje/master' | Christopher Allan Webber | 2011-07-02 | 6 | -53/+64 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Tiny pagination style changes | Jef van Schendel | 2011-07-01 | 2 | -1/+6 |
| | | | | |||||
| * | | | Remove dotted_line style from css | Jef van Schendel | 2011-07-01 | 1 | -9/+0 |
| | | | | |||||
| * | | | Fix tiny pagination error: missing end tag | Jef van Schendel | 2011-07-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Remove strong style from pagination | Jef van Schendel | 2011-07-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Reorder media.html (comments, icons, links, layout) | Jef van Schendel | 2011-07-01 | 2 | -41/+23 |
| | | | | |||||
| * | | | Reorganize media.html, comment part | Jef van Schendel | 2011-07-01 | 1 | -20/+16 |
| | | | | |||||
| * | | | Put comment author/date on the left | Jef van Schendel | 2011-07-01 | 1 | -3/+0 |
| | | | | |||||
| * | | | Add delete and edit icons | Jef van Schendel | 2011-07-01 | 3 | -0/+26 |
| | | | | |||||
| * | | | Fix first part of issue 402 - small images are no longer enlarged to 640px | Jef van Schendel | 2011-07-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add feed icon | Jef van Schendel | 2011-07-01 | 1 | -0/+0 |
| | | | | |||||
| * | | | Style comments (first draft only) | Jef van Schendel | 2011-07-01 | 2 | -10/+24 |
| | |/ | |/| |