mediagoblin.git
13 years agoNew thumbnail size is apparently 180x135.
Christopher Allan Webber [Sun, 3 Jul 2011 22:37:41 +0000 (17:37 -0500)]
New thumbnail size is apparently 180x135.

We don't know if that's permanent but if it isn't it seems "Mostly Harmless"

13 years agoStyle changes to messages. Tell me if I changed too much...
Jef van Schendel [Sun, 3 Jul 2011 21:32:39 +0000 (23:32 +0200)]
Style changes to messages. Tell me if I changed too much...

13 years agoTiny margin changes
Jef van Schendel [Sun, 3 Jul 2011 21:13:54 +0000 (23:13 +0200)]
Tiny margin changes

13 years agoStyle navigation buttons
Jef van Schendel [Sun, 3 Jul 2011 21:04:09 +0000 (23:04 +0200)]
Style navigation buttons

13 years agoFirst push with 180px wide thumbnails
Jef van Schendel [Sun, 3 Jul 2011 20:29:36 +0000 (22:29 +0200)]
First push with 180px wide thumbnails

13 years agoSwitched over to 960_16_col. This may break a bunch of stuff. If you find something...
Jef van Schendel [Sun, 3 Jul 2011 19:37:21 +0000 (21:37 +0200)]
Switched over to 960_16_col. This may break a bunch of stuff. If you find something that is broken, slap me.

13 years agoAdded reset.css and text.css from 960.gs. This might shake up a few styles!
Jef van Schendel [Sun, 3 Jul 2011 19:20:09 +0000 (21:20 +0200)]
Added reset.css and text.css from 960.gs. This might shake up a few styles!

13 years agoPut file input form at the top of submission form
Jef van Schendel [Sun, 3 Jul 2011 19:12:22 +0000 (21:12 +0200)]
Put file input form at the top of submission form

13 years agoMerge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit'
Christopher Allan Webber [Sun, 3 Jul 2011 14:43:39 +0000 (09:43 -0500)]
Merge remote branch 'remotes/jwandborg/f409-redirect_to_user_page_upon_submit'

13 years agoclass="media_image" accidentally added back during 400 merge. Fixing.
Christopher Allan Webber [Sun, 3 Jul 2011 14:42:45 +0000 (09:42 -0500)]
class="media_image" accidentally added back during 400 merge.  Fixing.

13 years agoSwitching single-quoted strings to double-quote to avoid escaping the apostrophe...
Christopher Allan Webber [Sun, 3 Jul 2011 14:29:09 +0000 (09:29 -0500)]
Switching single-quoted strings to double-quote to avoid escaping the apostrophe.. :)

13 years agoCaution an admin when they're editing someone else's media.
Christopher Allan Webber [Sun, 3 Jul 2011 14:26:40 +0000 (09:26 -0500)]
Caution an admin when they're editing someone else's media.

13 years agouser_gallery_url -> {{ user_gallery_url }} ... How embarassing.
Christopher Allan Webber [Sun, 3 Jul 2011 14:21:24 +0000 (09:21 -0500)]
user_gallery_url -> {{ user_gallery_url }} ... How embarassing.

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
Christopher Allan Webber [Sun, 3 Jul 2011 13:31:35 +0000 (08:31 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'

13 years agouses new 'username' variable in querystring to specify the user to edit
Caleb Forbes Davis V [Sun, 3 Jul 2011 07:43:57 +0000 (02:43 -0500)]
uses new 'username' variable in querystring to specify the user to edit

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

13 years agoallows admins to edit user media
Caleb Forbes Davis V [Sun, 3 Jul 2011 07:41:39 +0000 (02:41 -0500)]
allows admins to edit user media

13 years agomoves edit profile link to user page
Caleb Forbes Davis V [Sun, 3 Jul 2011 07:37:19 +0000 (02:37 -0500)]
moves edit profile link to user page

13 years agoFeature #409 - Submitting an image should redirect you back to user's
Joar Wandborg [Sun, 3 Jul 2011 05:50:35 +0000 (07:50 +0200)]
Feature #409 - Submitting an image should redirect you back to user's
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.

13 years agoMake pagination on user profile point to the user gallery
Christopher Allan Webber [Sun, 3 Jul 2011 03:09:46 +0000 (22:09 -0500)]
Make pagination on user profile point to the user gallery

This required a couple of changes:
 - making a new render_pagination macro
 - switching things over to use that

13 years agoJust some spacing changes in profile.html
Christopher Allan Webber [Sun, 3 Jul 2011 02:31:25 +0000 (21:31 -0500)]
Just some spacing changes in profile.html

13 years agoWe should link to the user's gallery, not the logged in person's gallery.
Christopher Allan Webber [Sun, 3 Jul 2011 02:31:04 +0000 (21:31 -0500)]
We should link to the user's gallery, not the logged in person's gallery.

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'
Christopher Allan Webber [Sun, 3 Jul 2011 02:16:39 +0000 (21:16 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/f401_prev_next_media_nav'

Conflicts:
mediagoblin/db/models.py
mediagoblin/templates/mediagoblin/user_pages/media.html

13 years agoLet users write their own config and paste files w/o affecting git
Christopher Allan Webber [Sun, 3 Jul 2011 00:01:55 +0000 (19:01 -0500)]
Let users write their own config and paste files w/o affecting git

13 years agoMerge remote branch 'remotes/elrond/idea/lazyserver'
Christopher Allan Webber [Sun, 3 Jul 2011 00:00:58 +0000 (19:00 -0500)]
Merge remote branch 'remotes/elrond/idea/lazyserver'

13 years agoMerge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
Christopher Allan Webber [Sun, 3 Jul 2011 00:00:01 +0000 (19:00 -0500)]
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html

13 years agoImprove lazyserver.sh to handle args
Elrond [Sat, 2 Jul 2011 23:53:10 +0000 (01:53 +0200)]
Improve lazyserver.sh to handle args

Run "./lazyserver.sh -h" to learn more.

13 years agoOnly show pagination if we have pages to show
Christopher Allan Webber [Sat, 2 Jul 2011 23:31:02 +0000 (18:31 -0500)]
Only show pagination if we have pages to show

13 years agoFeature #400 - Resize images to fit on page
Joar Wandborg [Sat, 2 Jul 2011 23:30:07 +0000 (01:30 +0200)]
Feature #400 - Resize images to fit on page

*   `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.

13 years agoIssue 406: media_details template deprecated. Removing!
Christopher Allan Webber [Sat, 2 Jul 2011 22:49:51 +0000 (17:49 -0500)]
Issue 406: media_details template deprecated.  Removing!

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix'
Christopher Allan Webber [Sat, 2 Jul 2011 22:46:26 +0000 (17:46 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix'

13 years agoNote from Chris Webber prefacing Elrond's DB abstraction idea.
Christopher Allan Webber [Sat, 2 Jul 2011 22:05:13 +0000 (17:05 -0500)]
Note from Chris Webber prefacing Elrond's DB abstraction idea.

13 years agoMerge remote branch 'remotes/elrond/idea/db_doc'
Christopher Allan Webber [Sat, 2 Jul 2011 22:01:43 +0000 (17:01 -0500)]
Merge remote branch 'remotes/elrond/idea/db_doc'

13 years agoMerge remote branch 'remotes/elrond/dev/init'
Christopher Allan Webber [Sat, 2 Jul 2011 20:48:49 +0000 (15:48 -0500)]
Merge remote branch 'remotes/elrond/dev/init'

13 years agoMove config.py to init/
Elrond [Sat, 2 Jul 2011 20:40:19 +0000 (22:40 +0200)]
Move config.py to init/

Some simple changes needed to do that.

The interesting question left:
Should config_spec.ini also be moved?

13 years agoMerge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback'
Christopher Allan Webber [Sat, 2 Jul 2011 19:39:35 +0000 (14:39 -0500)]
Merge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html

13 years agoRemoving that 'temporarily, an "image gallery" that isn't one really ;)' text
Christopher Allan Webber [Sat, 2 Jul 2011 19:34:39 +0000 (14:34 -0500)]
Removing that 'temporarily, an "image gallery" that isn't one really ;)' text

13 years agothe delete text should be flush against the image since the edit text is
Christopher Allan Webber [Sat, 2 Jul 2011 19:32:54 +0000 (14:32 -0500)]
the delete text should be flush against the image since the edit text is

13 years agoMore spacing / newline changes to media.html
Christopher Allan Webber [Sat, 2 Jul 2011 19:30:33 +0000 (14:30 -0500)]
More spacing / newline changes to media.html

13 years agoNot sure what these fields are here commented out for... removing
Christopher Allan Webber [Sat, 2 Jul 2011 19:29:47 +0000 (14:29 -0500)]
Not sure what these fields are here commented out for... removing

13 years agoCleaning up some indentation in media.html
Christopher Allan Webber [Sat, 2 Jul 2011 19:28:57 +0000 (14:28 -0500)]
Cleaning up some indentation in media.html

13 years agoimages/iconFoo.png filenames -> icon/icon_foo.png
Christopher Allan Webber [Sat, 2 Jul 2011 19:26:18 +0000 (14:26 -0500)]
images/iconFoo.png filenames -> icon/icon_foo.png

I have a thing against mixedCase :)

13 years agoMerge remote branch 'remotes/schendje/master'
Christopher Allan Webber [Sat, 2 Jul 2011 19:13:48 +0000 (14:13 -0500)]
Merge remote branch 'remotes/schendje/master'

13 years agoMove get_jinja_loader to init submodule.
Elrond [Thu, 23 Jun 2011 16:45:39 +0000 (18:45 +0200)]
Move get_jinja_loader to init submodule.

13 years agoMove mediagoblin.celery_setup -> mediagoblin.init.celery
Elrond [Sun, 19 Jun 2011 21:09:35 +0000 (23:09 +0200)]
Move mediagoblin.celery_setup -> mediagoblin.init.celery

As the first target of the new .init. submodule move
celery_setup there. Quite straight forward, just a lot of
places to change.

13 years agoStart mediagoblin.init
Elrond [Sat, 2 Jul 2011 18:25:09 +0000 (20:25 +0200)]
Start mediagoblin.init

13 years agoadds previous and next links in the sidebar
Caleb Forbes Davis V [Sat, 2 Jul 2011 11:15:58 +0000 (06:15 -0500)]
adds previous and next links in the sidebar

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

13 years agoBug #404 - Successful profile edit is successful!
Caleb Forbes Davis V [Sat, 2 Jul 2011 03:33:54 +0000 (22:33 -0500)]
Bug #404 - Successful profile edit is successful!

user is notified of successful profile edit w/o extra navigation

13 years agoMerge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Joar Wandborg [Fri, 1 Jul 2011 20:02:58 +0000 (22:02 +0200)]
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin

13 years agoTiny pagination style changes
Jef van Schendel [Fri, 1 Jul 2011 18:14:38 +0000 (20:14 +0200)]
Tiny pagination style changes

13 years agoRemove dotted_line style from css
Jef van Schendel [Fri, 1 Jul 2011 18:09:51 +0000 (20:09 +0200)]
Remove dotted_line style from css

13 years agoFix tiny pagination error: missing end tag
Jef van Schendel [Fri, 1 Jul 2011 18:08:12 +0000 (20:08 +0200)]
Fix tiny pagination error: missing end tag

13 years agoRemove strong style from pagination
Jef van Schendel [Fri, 1 Jul 2011 17:57:23 +0000 (19:57 +0200)]
Remove strong style from pagination

13 years agoReorder media.html (comments, icons, links, layout)
Jef van Schendel [Fri, 1 Jul 2011 16:59:07 +0000 (18:59 +0200)]
Reorder media.html (comments, icons, links, layout)

13 years agoReorganize media.html, comment part
Jef van Schendel [Fri, 1 Jul 2011 15:28:55 +0000 (17:28 +0200)]
Reorganize media.html, comment part

13 years agoPut comment author/date on the left
Jef van Schendel [Fri, 1 Jul 2011 15:25:15 +0000 (17:25 +0200)]
Put comment author/date on the left

13 years agoAdd delete and edit icons
Jef van Schendel [Fri, 1 Jul 2011 15:20:22 +0000 (17:20 +0200)]
Add delete and edit icons

13 years agoFix first part of issue 402 - small images are no longer enlarged to 640px
Jef van Schendel [Fri, 1 Jul 2011 13:47:37 +0000 (15:47 +0200)]
Fix first part of issue 402 - small images are no longer enlarged to 640px

13 years agoAdd feed icon
Jef van Schendel [Fri, 1 Jul 2011 13:43:05 +0000 (15:43 +0200)]
Add feed icon

13 years agoStyle comments (first draft only)
Jef van Schendel [Fri, 1 Jul 2011 13:41:44 +0000 (15:41 +0200)]
Style comments (first draft only)

13 years agoIssue #362 - Simple comments - Changes based on feedback recieved from #mediagoblin
Joar Wandborg [Fri, 1 Jul 2011 13:26:29 +0000 (15:26 +0200)]
Issue #362 - Simple comments - Changes based on feedback recieved from #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.

13 years agoRemoves spurious file
Will Kahn-Greene [Fri, 1 Jul 2011 10:24:34 +0000 (06:24 -0400)]
Removes spurious file

Matt added this file ages ago, but it's just an empty file, so I'm removing
it.

13 years agoActually make use of CELERY_SETUP in from_tests.py
Christopher Allan Webber [Thu, 30 Jun 2011 21:57:55 +0000 (16:57 -0500)]
Actually make use of CELERY_SETUP in from_tests.py

13 years agoDocument the db submodule a bit
Elrond [Thu, 30 Jun 2011 21:26:02 +0000 (23:26 +0200)]
Document the db submodule a bit

Document the ideas behind the db submodule.
And document what that actually means.

13 years agoMerge remote branch 'remotes/schendje/master'
Christopher Allan Webber [Thu, 30 Jun 2011 17:57:31 +0000 (12:57 -0500)]
Merge remote branch 'remotes/schendje/master'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html

13 years agoComment indexes
Christopher Allan Webber [Thu, 30 Jun 2011 17:51:32 +0000 (12:51 -0500)]
Comment indexes

13 years agoMerge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Joar Wandborg [Thu, 30 Jun 2011 09:48:52 +0000 (11:48 +0200)]
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin

13 years agoExcitedly send a user a message that their comment was posted.
Christopher Allan Webber [Thu, 30 Jun 2011 01:51:17 +0000 (20:51 -0500)]
Excitedly send a user a message that their comment was posted.

13 years agoUse the cleaned_markdown_conversion method instead of doing that manually
Christopher Allan Webber [Thu, 30 Jun 2011 01:41:52 +0000 (20:41 -0500)]
Use the cleaned_markdown_conversion method instead of doing that manually

13 years agoMerge remote branch 'remotes/jwandborg/feature_362-simple_comments'
Christopher Allan Webber [Thu, 30 Jun 2011 01:27:48 +0000 (20:27 -0500)]
Merge remote branch 'remotes/jwandborg/feature_362-simple_comments'

13 years agoMerge branch 'feature_362-simple_comments'
Joar Wandborg [Wed, 29 Jun 2011 14:12:33 +0000 (16:12 +0200)]
Merge branch 'feature_362-simple_comments'

13 years agoPut messages.html in grid_12, above content
Jef van Schendel [Wed, 29 Jun 2011 12:05:28 +0000 (14:05 +0200)]
Put messages.html in grid_12, above content

13 years agoMerge remote-tracking branch 'gitorious/master'
Jef van Schendel [Wed, 29 Jun 2011 11:53:17 +0000 (13:53 +0200)]
Merge remote-tracking branch 'gitorious/master'

13 years agoMaking the messages conform to the 960.gx widths
Christopher Allan Webber [Wed, 29 Jun 2011 01:56:06 +0000 (20:56 -0500)]
Making the messages conform to the 960.gx widths

13 years agoStyling for the messaging list items. A rainbow of messages!
Christopher Allan Webber [Wed, 29 Jun 2011 01:54:40 +0000 (20:54 -0500)]
Styling for the messaging list items.  A rainbow of messages!

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'
Christopher Allan Webber [Wed, 29 Jun 2011 01:09:35 +0000 (20:09 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'

13 years agoIssue #362 - Added new `wtforms.Form`; `MediaCommentForm()`
Joar Wandborg [Tue, 28 Jun 2011 23:35:43 +0000 (01:35 +0200)]
Issue #362 - Added new `wtforms.Form`; `MediaCommentForm()`

*   ADDED `MediaCommentForm` is a form for `MediaComment`
    user entry and posting.

13 years agoIssue #362 - Updated `mediagoblin.user_pages.views` to handle new "Simple comments...
Joar Wandborg [Tue, 28 Jun 2011 23:29:39 +0000 (01:29 +0200)]
Issue #362 - Updated `mediagoblin.user_pages.views` to handle new "Simple comments" feature

*   ADDED `media_post_comment(request)` which creates `MediaComments`
    from POST requests
*   UPDATED `media_home(request, media, **kwargs)` now passes `comments`,
    `pagination` and `comments_form` to `media.html`

13 years agoIssue #362 - Updated media.html with things necessary for the simple comment feature
Joar Wandborg [Tue, 28 Jun 2011 23:21:46 +0000 (01:21 +0200)]
Issue #362 - Updated media.html with things necessary for the simple comment feature

*   `media.html` now imports `wtforms.html` for use in comment form rendering
*   `media.html` now outputs a commenting form if `request.user` evals to `True`
*   `media.html` now outputs `MediaComments` if `comments` evals to `True`
*   `media.html` now includes `pagination.html` to handle comment pagination

13 years agoIssue #362 - Updated the MediaComment model
Joar Wandborg [Tue, 28 Jun 2011 23:16:51 +0000 (01:16 +0200)]
Issue #362 - Updated the MediaComment model

*   `MediaComment.get_comments()` now uses pagination
*   `MediaComment.get_comments()` now sorts by `created` DESC
*   `MediaComment.media_entry` is now **required**
*   `MediaComment.media_entry()` now returns parent `MediaEntry`

13 years agoIssue #362 - Added a route to MediaComment POST handler
Joar Wandborg [Tue, 28 Jun 2011 23:14:52 +0000 (01:14 +0200)]
Issue #362 - Added a route to MediaComment POST handler

13 years agoMerge remote-tracking branch 'gitorious/master'
Jef van Schendel [Tue, 28 Jun 2011 11:50:05 +0000 (13:50 +0200)]
Merge remote-tracking branch 'gitorious/master'

13 years agoadds message queue unit testing
Caleb Forbes Davis V [Tue, 28 Jun 2011 07:35:44 +0000 (02:35 -0500)]
adds message queue unit testing

13 years agoremoves messages.add_message from the global template context
Caleb Forbes Davis V [Tue, 28 Jun 2011 04:49:57 +0000 (23:49 -0500)]
removes messages.add_message from the global template context

templates don't add messages. views are responsible for that.

13 years agoDocumenging index utils and adjusting how remove_deprecated_indexes gets arguments
Christopher Allan Webber [Tue, 28 Jun 2011 01:48:35 +0000 (20:48 -0500)]
Documenging index utils and adjusting how remove_deprecated_indexes gets arguments

More specifically, we now just take a dictionary of lists, like:
   {'collection': ['index_identifier1', 'index_identifier2']}

Previously we took something with more info like in add_new_indexes,
but that extra info isn't really necessary.

13 years agoDocumentation updates to indexes.py's docstring
Christopher Allan Webber [Tue, 28 Jun 2011 01:40:31 +0000 (20:40 -0500)]
Documentation updates to indexes.py's docstring

Includes information on how to deprecate indexes.

13 years agoUpdating migrate.py to actually run the indexing commands
Christopher Allan Webber [Tue, 28 Jun 2011 01:05:01 +0000 (20:05 -0500)]
Updating migrate.py to actually run the indexing commands

13 years agoAdding our current indexes and removing the index that was in models.py
Christopher Allan Webber [Mon, 27 Jun 2011 21:56:41 +0000 (16:56 -0500)]
Adding our current indexes and removing the index that was in models.py

13 years agoTools to add / remove indexes from collections
Christopher Allan Webber [Mon, 27 Jun 2011 21:56:12 +0000 (16:56 -0500)]
Tools to add / remove indexes from collections

13 years agoIssue 362 - Add simple comments
Joar Wandborg [Mon, 27 Jun 2011 21:39:40 +0000 (23:39 +0200)]
Issue 362 - Add simple comments

*   Added MediaComment database model
    Holds `media_entry` (`ObjectId`), `author` (`ObjectId`), `created`, `content` and `content_html`.

13 years agoTiny changes
Jef van Schendel [Mon, 27 Jun 2011 20:41:58 +0000 (22:41 +0200)]
Tiny changes

13 years agoImplement sidebar on media page
Jef van Schendel [Mon, 27 Jun 2011 20:39:05 +0000 (22:39 +0200)]
Implement sidebar on media page

13 years agoadds message queue
Caleb Forbes Davis V [Mon, 27 Jun 2011 18:13:52 +0000 (13:13 -0500)]
adds message queue

Feature #368 - messaging framework
* message levels are debug, info, success, warning, and error
* display mechanism - base.html includes messages.html for now
* fetch_messages and add_message are available to all templates
  using jinja2 environment.globals
* messages are displayed and cleared. no persistence

13 years agoStore the collection information in the ACTIVE_INDEXES keys
Christopher Allan Webber [Mon, 27 Jun 2011 02:51:38 +0000 (21:51 -0500)]
Store the collection information in the ACTIVE_INDEXES keys

13 years agoA base set of indexes for us to use with our new indexing tool.
Christopher Allan Webber [Mon, 27 Jun 2011 02:10:16 +0000 (21:10 -0500)]
A base set of indexes for us to use with our new indexing tool.

13 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Sun, 26 Jun 2011 20:22:01 +0000 (15:22 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

13 years agoCelery wasn't really being properly connected during tests.
Christopher Allan Webber [Sun, 26 Jun 2011 19:45:19 +0000 (14:45 -0500)]
Celery wasn't really being properly connected during tests.

Lots of fixes to do this.

 - setup_celery_from_config no longer responsible for checking
   'celery_setup_elsewhere'; that's the app's job.  (This was a problem
   because more than the app was relying on using this function)
 - Allow us to specifically set the config file we're setting up
   celery from with setup_self
 - Set up celery_always_eager.  This is something we strongly want
   while doing tests.
 - Instead of setting up the app in the get_test_app method, let's set
   that up simply by importing from_tests, which should itself up via
   from_celery being the environment variable being set.

13 years agoReordering the uploaded on/by and description sections of media display template
Christopher Allan Webber [Sat, 25 Jun 2011 19:32:31 +0000 (14:32 -0500)]
Reordering the uploaded on/by and description sections of media display template

13 years agoAlign images in a gallery to the center
Christopher Allan Webber [Sat, 25 Jun 2011 18:15:15 +0000 (13:15 -0500)]
Align images in a gallery to the center

13 years agoJust adjusting indentation a little bit in the base template.
Christopher Allan Webber [Sat, 25 Jun 2011 18:10:25 +0000 (13:10 -0500)]
Just adjusting indentation a little bit in the base template.

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/is330'
Christopher Allan Webber [Sat, 25 Jun 2011 18:08:04 +0000 (13:08 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/is330'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/gallery.html