aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Style navigation buttonsJef van Schendel2011-07-032-8/+29
| | | | | | | | |
* | | | | | | | | First push with 180px wide thumbnailsJef van Schendel2011-07-033-23/+17
| | | | | | | | |
* | | | | | | | | Switched over to 960_16_col. This may break a bunch of stuff. If you find ↵Jef van Schendel2011-07-0312-383/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | something that is broken, slap me.
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Webber2011-07-031-4/+4
| | | | | | | | | |
* | | | | | | | | | Switching single-quoted strings to double-quote to avoid escaping the ↵Christopher Allan Webber2011-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apostrophe.. :)
* | | | | | | | | | 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 ↵Christopher Allan Webber2011-07-035-6/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
| * | | | | | | | | | uses new 'username' variable in querystring to specify the user to editCaleb Forbes Davis V2011-07-032-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 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required a couple of changes: - making a new render_pagination macro - switching things over to use that
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/models.py mediagoblin/templates/mediagoblin/user_pages/media.html
| * | | | | | | | | | adds previous and next links in the sidebarCaleb Forbes Davis V2011-07-024-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
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run "./lazyserver.sh -h" to learn more.
* | | | | | | | | | | Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'Christopher Allan Webber2011-07-022-13/+33
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
| * | | | | | | | | Feature #400 - Resize images to fit on pageJoar Wandborg2011-07-032-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.
| * | | | | | | | | 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
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | user is notified of successful profile edit w/o extra navigation
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the ideas behind the db submodule. And document what that actually means.
* | | | | | | | | | Merge remote branch 'remotes/elrond/dev/init'Christopher Allan Webber2011-07-0214-33/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move config.py to init/Elrond2011-07-025-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.Elrond2011-07-023-17/+20
| | | | | | | | | | |
| * | | | | | | | | | Move mediagoblin.celery_setup -> mediagoblin.init.celeryElrond2011-07-0210-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.initElrond2011-07-021-0/+15
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge remote branch ↵Christopher Allan Webber2011-07-023-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 Wandborg2011-07-013-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.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have a thing against mixedCase :)
* | | | | | | | | | | Merge remote branch 'remotes/schendje/master'Christopher Allan Webber2011-07-026-53/+64
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Tiny pagination style changesJef van Schendel2011-07-012-1/+6
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-07 23:37:56 +0000