Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'remotes/amusablelemur/feature374' | Christopher Allan Webber | 2011-07-09 | 2 | -5/+9 |
|\ | |||||
| * | Updated spacings in code for better readability | Rasmus Larsson | 2011-07-09 | 2 | -5/+5 |
| | | |||||
| * | Updated the loginpage to not show a link to register if registrations are ↵ | Rasmus Larsson | 2011-07-09 | 1 | -0/+2 |
| | | | | | | | | disabled | ||||
| * | Added configuration variable to toggle registrations, if disabled the ↵ | Rasmus Larsson | 2011-07-09 | 1 | -0/+2 |
| | | | | | | | | registration page redirects to index and no link to register is shown | ||||
* | | Removed route, view and template file for "Submit Success" page | Rasmus Larsson | 2011-07-09 | 1 | -22/+0 |
|/ | |||||
* | uses the messaging system to notify user of result of verification check | Caleb Forbes Davis V | 2011-07-04 | 1 | -28/+0 |
| | | | | | | Feature #424 - Use messaging system for email verifification check response * uses add_message in verify_email and routes to the user page, bypassing verify_email.html | ||||
* | This extra <br /> is maybe a bit too much space... | Christopher Allan Webber | 2011-07-04 | 1 | -1/+1 |
| | |||||
* | Don't even show the profile box if no profile exists | Christopher Allan Webber | 2011-07-04 | 1 | -12/+14 |
| | |||||
* | Put some space between the gallery and the rest of the page content | Christopher Allan Webber | 2011-07-04 | 1 | -0/+2 |
| | |||||
* | Move submit an item to the user page. | Christopher Allan Webber | 2011-07-04 | 1 | -0/+6 |
| | |||||
* | Put the profile stuff in p's instead of <ul>'s | Christopher Allan Webber | 2011-07-04 | 1 | -14/+12 |
| | |||||
* | Adjusting indentation of object_gallery.html | Christopher Allan Webber | 2011-07-04 | 1 | -14/+14 |
| | |||||
* | Put link to edit profile slightly after the profile | Christopher Allan Webber | 2011-07-04 | 1 | -3/+4 |
| | |||||
* | Removing a tab... hate mixed tabs and spaces :) | Christopher Allan Webber | 2011-07-04 | 1 | -1/+1 |
| | |||||
* | Just removing some trailing whitespace | Christopher Allan Webber | 2011-07-04 | 1 | -4/+4 |
| | |||||
* | Check user['_id'] instead of username, which is slightly more guaranteed | Christopher Allan Webber | 2011-07-04 | 1 | -2/+2 |
| | |||||
* | bug#422_user_can_not_edit_own_profile_unless_admin | Caleb Forbes Davis V | 2011-07-04 | 1 | -1/+1 |
| | | | | user != username..... | ||||
* | Style navigation buttons | Jef van Schendel | 2011-07-03 | 1 | -8/+6 |
| | |||||
* | First push with 180px wide thumbnails | Jef van Schendel | 2011-07-03 | 2 | -12/+12 |
| | |||||
* | Switched over to 960_16_col. This may break a bunch of stuff. If you find ↵ | Jef van Schendel | 2011-07-03 | 7 | -15/+14 |
| | | | | something that is broken, slap me. | ||||
* | Added reset.css and text.css from 960.gs. This might shake up a few styles! | Jef van Schendel | 2011-07-03 | 1 | -0/+4 |
| | |||||
* | Put file input form at the top of submission form | Jef van Schendel | 2011-07-03 | 1 | -3/+2 |
| | |||||
* | class="media_image" accidentally added back during 400 merge. Fixing. | Christopher Allan Webber | 2011-07-03 | 1 | -4/+4 |
| | |||||
* | 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 | 4 | -4/+8 |
|\ | | | | | | | '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 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | 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 | 4 | -30/+54 |
| | | | | | | | | | | | | 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 | 2 | -0/+46 |
|\ | | | | | | | | | | | 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 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | 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 | 1 | -2/+8 |
|\ \ | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | | Feature #400 - Resize images to fit on page | Joar Wandborg | 2011-07-03 | 1 | -2/+7 |
| |/ | | | | | | | | | | | | | | | | | | | * `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 ↵ | Christopher Allan Webber | 2011-07-02 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | '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 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #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 | 1 | -2/+2 |
| | | | | | | | | | | | | I have a thing against mixedCase :) | ||||
* | | | Tiny pagination style changes | Jef van Schendel | 2011-07-01 | 1 | -1/+2 |
| | | | |||||
* | | | 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 | 1 | -19/+20 |
| | | | |||||
* | | | Reorganize media.html, comment part | Jef van Schendel | 2011-07-01 | 1 | -20/+16 |
| | | |