aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Reorder media.html (comments, icons, links, layout)Jef van Schendel2011-07-012-41/+23
| | | | | | | | | | |
| * | | | | | | | | | Reorganize media.html, comment partJef van Schendel2011-07-011-20/+16
| | | | | | | | | | |
| * | | | | | | | | | Put comment author/date on the leftJef van Schendel2011-07-011-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Add delete and edit iconsJef van Schendel2011-07-013-0/+26
| | | | | | | | | | |
| * | | | | | | | | | Fix first part of issue 402 - small images are no longer enlarged to 640pxJef van Schendel2011-07-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add feed iconJef van Schendel2011-07-011-0/+0
| | | | | | | | | | |
| * | | | | | | | | | Style comments (first draft only)Jef van Schendel2011-07-012-10/+24
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Removes spurious fileWill Kahn-Greene2011-07-011-0/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matt added this file ages ago, but it's just an empty file, so I'm removing it.
* | | | | | | | | Actually make use of CELERY_SETUP in from_tests.pyChristopher Allan Webber2011-06-301-3/+6
|/ / / / / / / /
* | | | | | | | Merge remote branch 'remotes/schendje/master'Christopher Allan Webber2011-06-305-88/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
| * | | | | | | | Put messages.html in grid_12, above contentJef van Schendel2011-06-292-13/+6
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-296-0/+158
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-284-7/+216
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Tiny changesJef van Schendel2011-06-272-3/+1
| | | | | | | | |
| * | | | | | | | Implement sidebar on media pageJef van Schendel2011-06-273-32/+45
| | | | | | | | |
* | | | | | | | | Comment indexesChristopher Allan Webber2011-06-301-0/+10
| |_|_|_|/ / / / |/| | | | | | |