mediagoblin.git
13 years agoremoved email variables from globals module
Deb [Wed, 13 Jul 2011 01:21:35 +0000 (21:21 -0400)]
removed email variables from globals module

13 years agoMerge remote branch 'remotes/osamak/master'
Christopher Allan Webber [Tue, 12 Jul 2011 01:31:45 +0000 (20:31 -0500)]
Merge remote branch 'remotes/osamak/master'

13 years agoMove db_name default into config_spec.ini
Elrond [Mon, 11 Jul 2011 21:25:15 +0000 (23:25 +0200)]
Move db_name default into config_spec.ini

The default name of the database ("mediagoblin") was coded
in db/open.py and init/celery/__init__.py.
Instead use the new config system to have this as the
default for the "db_name" config option.

13 years agopython-lxml is required on Fedora
Osama Khalid [Mon, 11 Jul 2011 17:55:25 +0000 (20:55 +0300)]
python-lxml is required on Fedora

13 years agoReferring to the Hacking HOWTO in deploymenthowto (this is where I looked in first...
Osama Khalid [Mon, 11 Jul 2011 17:34:37 +0000 (20:34 +0300)]
Referring to the Hacking HOWTO in deploymenthowto (this is where I looked in first when I wanted to build MG)

13 years agoSorry, that OptionalField belonged there.
Christopher Allan Webber [Sat, 9 Jul 2011 22:16:18 +0000 (17:16 -0500)]
Sorry, that OptionalField belonged there.

I am a bad person and am not allowed to commit anything else today.

13 years ago<Elrond> Oh well... Did I really have this wtforms cruft in my setup_workbench
Christopher Allan Webber [Sat, 9 Jul 2011 22:13:21 +0000 (17:13 -0500)]
<Elrond> Oh well... Did I really have this wtforms cruft in my setup_workbench
         commit. :-(  I don't know even, how it got in there. :-|

13 years agoAdded a note about workbench only currently being used by celery
Christopher Allan Webber [Sat, 9 Jul 2011 22:11:23 +0000 (17:11 -0500)]
Added a note about workbench only currently being used by celery

13 years agoMerge remote branch 'remotes/elrond/dev/init'
Christopher Allan Webber [Sat, 9 Jul 2011 21:57:20 +0000 (16:57 -0500)]
Merge remote branch 'remotes/elrond/dev/init'

13 years agoAdjusting documentation in indexes.py also re: more info in deprecation
Christopher Allan Webber [Sat, 9 Jul 2011 21:52:57 +0000 (16:52 -0500)]
Adjusting documentation in indexes.py also re: more info in deprecation

13 years agoChanging things back so that we keep information about deprecated
Christopher Allan Webber [Sat, 9 Jul 2011 21:51:19 +0000 (16:51 -0500)]
Changing things back so that we keep information about deprecated
indexes around.

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b404_v3_edit_profile_submit_fail'
Christopher Allan Webber [Sat, 9 Jul 2011 14:30:43 +0000 (09:30 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b404_v3_edit_profile_submit_fail'

13 years agoMerge remote branch 'remotes/jwandborg/f431-prevent_comment_link_expiry'
Christopher Allan Webber [Sat, 9 Jul 2011 14:23:34 +0000 (09:23 -0500)]
Merge remote branch 'remotes/jwandborg/f431-prevent_comment_link_expiry'

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/437_slug_shouldnt_be_empty'
Christopher Allan Webber [Sat, 9 Jul 2011 14:20:22 +0000 (09:20 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/437_slug_shouldnt_be_empty'

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

13 years agoRemoving trailing whitespace from this file
Christopher Allan Webber [Sat, 9 Jul 2011 14:02:57 +0000 (09:02 -0500)]
Removing trailing whitespace from this file

13 years agoAdd a warning to the user that registrations are disabled.
Christopher Allan Webber [Sat, 9 Jul 2011 14:02:17 +0000 (09:02 -0500)]
Add a warning to the user that registrations are disabled.

13 years agoMerge remote branch 'remotes/amusablelemur/feature374'
Christopher Allan Webber [Sat, 9 Jul 2011 13:58:22 +0000 (08:58 -0500)]
Merge remote branch 'remotes/amusablelemur/feature374'

13 years agoUpdated spacings in code for better readability
Rasmus Larsson [Sat, 9 Jul 2011 13:52:30 +0000 (15:52 +0200)]
Updated spacings in code for better readability

13 years agoUpdated the loginpage to not show a link to register if registrations are disabled
Rasmus Larsson [Sat, 9 Jul 2011 13:19:55 +0000 (15:19 +0200)]
Updated the loginpage to not show a link to register if registrations are disabled

13 years agoAdded configuration variable to toggle registrations, if disabled the registration...
Rasmus Larsson [Sat, 9 Jul 2011 13:12:00 +0000 (15:12 +0200)]
Added configuration variable to toggle registrations, if disabled the registration page redirects to index and no link to register is shown

13 years agoRemoved route, view and template file for "Submit Success" page
Rasmus Larsson [Sat, 9 Jul 2011 00:47:06 +0000 (02:47 +0200)]
Removed route, view and template file for "Submit Success" page

13 years agoTiny height fix to footer
Jef van Schendel [Fri, 8 Jul 2011 14:05:20 +0000 (16:05 +0200)]
Tiny height fix to footer

13 years agoTiny padding fix for forms/h1
Jef van Schendel [Fri, 8 Jul 2011 14:03:17 +0000 (16:03 +0200)]
Tiny padding fix for forms/h1

13 years agoFix logo styling, positioning
Jef van Schendel [Fri, 8 Jul 2011 14:01:07 +0000 (16:01 +0200)]
Fix logo styling, positioning

13 years agoMoved Submit button to header, styled button
Jef van Schendel [Fri, 8 Jul 2011 13:53:45 +0000 (15:53 +0200)]
Moved Submit button to header, styled button

13 years agoAdded sidebar to profile page; moved some content
Jef van Schendel [Fri, 8 Jul 2011 13:22:15 +0000 (15:22 +0200)]
Added sidebar to profile page; moved some content

13 years agoRemove p style; not need yet
Jef van Schendel [Fri, 8 Jul 2011 13:14:27 +0000 (15:14 +0200)]
Remove p style; not need yet

13 years agoUpdated `MediaCommentForm.field_comment` => `MediaCommentForm.comment_content`
Joar Wandborg [Thu, 7 Jul 2011 20:45:51 +0000 (22:45 +0200)]
Updated `MediaCommentForm.field_comment` => `MediaCommentForm.comment_content`

*   Also changed file encoding of `user_pages/forms.py` from dos to unix.

13 years agoFactor setup_workbench into init submodule.
Elrond [Thu, 7 Jul 2011 20:08:20 +0000 (22:08 +0200)]
Factor setup_workbench into init submodule.

13 years agoChange pagination styling; add 2 images
Jef van Schendel [Thu, 7 Jul 2011 18:04:30 +0000 (20:04 +0200)]
Change pagination styling; add 2 images

13 years agoBug #437 - adds required validator to slug field for media edit'
Caleb Forbes Davis V [Thu, 7 Jul 2011 16:11:03 +0000 (11:11 -0500)]
Bug #437 - adds required validator to slug field for media edit'

otherwise we get a 404 because we navigate to blank slug

13 years agoIssue #431 - Prevent comment link expiry - Added functionality for comment linking
Joar Wandborg [Thu, 7 Jul 2011 16:04:19 +0000 (18:04 +0200)]
Issue #431 - Prevent comment link expiry - Added functionality for comment linking

*   `media.html`
    *   Changed comment textarea handle from `comment` => `field_comment`
    *   Active comment is hilighted with the CSS class name `comment_active`
     and also with the hyperlink anchor #comment
    *   Changed media.html so that pagination always uses
     Route('mediagoblin.user_pages.media_home') as base_url
*   `user_pages/forms.py`
    *   Renamed MediaComment form field `comment` => `field_comment`
*   `user_pages/routing.py`
    *   Added route for `/u/joar/m/123..456/c/234..567/`, points to `media_home`
*   `user_pages/views.py`
    *   `media_home` now checks if the request contains a comment id parameter
        then acts accordingly with pagination whether to call it with a
        `jump_to_id` or not.
    * `media_post_comment` - Updated MediaCommentForm field name
        `comment` => `field_comment`
*   `util.py`
    *   `redirect` now supports querystring arguments. - NOT USED (should we
        keep it? I think so, it might be useful, sometime [don't call me a
        code hoarder]).
    *   `Pagination.__init__` now accepts one further argument, the `jump_to_id`.
        It assist the comment linking functionality in finding and returning the
        proper page for a comment.
        This feature will work for all kinds of objects. It might not be
        optimal, but it is well functional :)

13 years agoAdditional style changes to navigation; add three navigation images
Jef van Schendel [Thu, 7 Jul 2011 15:54:33 +0000 (17:54 +0200)]
Additional style changes to navigation; add three navigation images

13 years agobug #404 - corrects querystring variable name in redirect
Caleb Forbes Davis V [Thu, 7 Jul 2011 15:45:23 +0000 (10:45 -0500)]
bug #404 - corrects querystring variable name in redirect

13 years agoExperimental black-and-white style change
Jef van Schendel [Thu, 7 Jul 2011 15:21:02 +0000 (17:21 +0200)]
Experimental black-and-white style change

13 years agoThis should actually fix the next and previous buttons now. Sorry I borked the merge!
Christopher Allan Webber [Thu, 7 Jul 2011 13:22:12 +0000 (08:22 -0500)]
This should actually fix the next and previous buttons now.  Sorry I borked the merge!

13 years agoAlso encourages editing your profile and submitting images
Christopher Allan Webber [Thu, 7 Jul 2011 03:52:08 +0000 (22:52 -0500)]
Also encourages editing your profile and submitting images

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/f424_email_verified_messaging'
Christopher Allan Webber [Thu, 7 Jul 2011 03:49:53 +0000 (22:49 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/f424_email_verified_messaging'

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll...
Christopher Allan Webber [Thu, 7 Jul 2011 03:47:33 +0000 (22:47 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll_and_gallery'

Conflicts:
mediagoblin/db/models.py

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'
Christopher Allan Webber [Thu, 7 Jul 2011 03:38:19 +0000 (22:38 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'

Conflicts:
mediagoblin/edit/views.py

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b429_fix_edit_profile_form_validation'
Christopher Allan Webber [Thu, 7 Jul 2011 03:35:19 +0000 (22:35 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b429_fix_edit_profile_form_validation'

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/f435_limit_prev_next_by_processed'
Christopher Allan Webber [Thu, 7 Jul 2011 03:34:33 +0000 (22:34 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/f435_limit_prev_next_by_processed'

13 years agoMerge remote branch 'remotes/gullydwarf-cfdv/b434_prev_next_use_slug'
Christopher Allan Webber [Thu, 7 Jul 2011 03:33:37 +0000 (22:33 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/b434_prev_next_use_slug'

13 years agoInstructions for installing MediaGoblin on Fedora
Christopher Allan Webber [Thu, 7 Jul 2011 03:29:12 +0000 (22:29 -0500)]
Instructions for installing MediaGoblin on Fedora

13 years agoedit profile submit redirects to user home page
Caleb Forbes Davis V [Wed, 6 Jul 2011 22:14:07 +0000 (17:14 -0500)]
edit profile submit redirects to user home page

13 years agoB #429 - form validation allows blank profile url
Caleb Forbes Davis V [Wed, 6 Jul 2011 03:11:56 +0000 (22:11 -0500)]
B #429 - form validation allows blank profile url

13 years agoslug-style urls in previous and next urls look much better
Caleb Forbes Davis V [Wed, 6 Jul 2011 02:40:00 +0000 (21:40 -0500)]
slug-style urls in previous and next urls look much better

Bug #434 - identifies media by slug instead of _id in prev/next

13 years agof#435 - avoids linking to unprocessed media in prev and next
Caleb Forbes Davis V [Wed, 6 Jul 2011 02:33:02 +0000 (21:33 -0500)]
f#435 - avoids linking to unprocessed media in prev and next

13 years agoMakes maketarball more resilient to errors
Will Kahn-Greene [Tue, 5 Jul 2011 13:36:07 +0000 (09:36 -0400)]
Makes maketarball more resilient to errors

13 years agoUpdates version to 0.0.3.
Will Kahn-Greene [Tue, 5 Jul 2011 13:26:45 +0000 (09:26 -0400)]
Updates version to 0.0.3.

13 years agoAdds tarball generation script
Will Kahn-Greene [Tue, 5 Jul 2011 13:23:20 +0000 (09:23 -0400)]
Adds tarball generation script

This just makes it easier to generate tarballs of master and
tarballs of releases.

13 years agoFeature #423 - gallery and scroll image ordering match
Caleb Forbes Davis V [Tue, 5 Jul 2011 01:24:57 +0000 (20:24 -0500)]
Feature #423 - gallery and scroll image ordering match

13 years agoallows using messaging instead of verify_email.html to pass tests
Caleb Forbes Davis V [Tue, 5 Jul 2011 01:04:00 +0000 (20:04 -0500)]
allows using messaging instead of verify_email.html to pass tests

* re-instated verification_successful flag
* modified test_auth to verify nav to user_pages/user.html template

13 years agouses the messaging system to notify user of result of verification check
Caleb Forbes Davis V [Tue, 5 Jul 2011 00:42:45 +0000 (19:42 -0500)]
uses the messaging system to notify user of result of verification check

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

13 years agoThis extra <br /> is maybe a bit too much space...
Christopher Allan Webber [Mon, 4 Jul 2011 22:08:10 +0000 (17:08 -0500)]
This extra <br /> is maybe a bit too much space...

13 years agoLet setup_global_and_app_config call setup_globals
Elrond [Mon, 4 Jul 2011 22:02:04 +0000 (00:02 +0200)]
Let setup_global_and_app_config call setup_globals

Let setup_global_and_app_config set the global and app
config in the mg_globals already. This way, the config is
available to everyone very early.

13 years agoA few media thumbnail changes pre-release
Christopher Allan Webber [Mon, 4 Jul 2011 21:58:07 +0000 (16:58 -0500)]
A few media thumbnail changes pre-release

 - adjust padding so 5 media thumbs can appear per row
 - lowering the h1 margins
 - adding a profile content bottom margin

13 years agoCreate setup_global_and_app_config
Elrond [Mon, 4 Jul 2011 21:57:45 +0000 (23:57 +0200)]
Create setup_global_and_app_config

Moving the config reading and error reporting from app.py
to init/__init__.py. Straight forward.

This also fixes the duplicated exceptions.

13 years agoDon't even show the profile box if no profile exists
Christopher Allan Webber [Mon, 4 Jul 2011 21:54:06 +0000 (16:54 -0500)]
Don't even show the profile box if no profile exists

13 years agoMove setting up of staticdirector to init submodule
Elrond [Mon, 4 Jul 2011 21:47:13 +0000 (23:47 +0200)]
Move setting up of staticdirector to init submodule

This duplicates some exceptions, which will be fixed very
soon.

13 years agoSet the jpeg quality at 90 for now...
Christopher Allan Webber [Mon, 4 Jul 2011 20:40:05 +0000 (15:40 -0500)]
Set the jpeg quality at 90 for now...

13 years agoPut some space between the gallery and the rest of the page content
Christopher Allan Webber [Mon, 4 Jul 2011 16:17:51 +0000 (11:17 -0500)]
Put some space between the gallery and the rest of the page content

13 years agoNot happy with 180x135, switching back to 180x180
Christopher Allan Webber [Mon, 4 Jul 2011 14:41:57 +0000 (09:41 -0500)]
Not happy with 180x135, switching back to 180x180

13 years agoMove submit an item to the user page.
Christopher Allan Webber [Mon, 4 Jul 2011 14:41:43 +0000 (09:41 -0500)]
Move submit an item to the user page.

13 years agoPut the profile stuff in p's instead of <ul>'s
Christopher Allan Webber [Mon, 4 Jul 2011 14:11:13 +0000 (09:11 -0500)]
Put the profile stuff in p's instead of <ul>'s

13 years ago.message_info was missing closing }
Christopher Allan Webber [Mon, 4 Jul 2011 14:08:57 +0000 (09:08 -0500)]
.message_info was missing closing }

13 years agoAdjusting indentation of object_gallery.html
Christopher Allan Webber [Mon, 4 Jul 2011 14:04:37 +0000 (09:04 -0500)]
Adjusting indentation of object_gallery.html

13 years agoPut link to edit profile slightly after the profile
Christopher Allan Webber [Mon, 4 Jul 2011 13:49:52 +0000 (08:49 -0500)]
Put link to edit profile slightly after the profile

13 years agoRemoving a tab... hate mixed tabs and spaces :)
Christopher Allan Webber [Mon, 4 Jul 2011 13:47:46 +0000 (08:47 -0500)]
Removing a tab... hate mixed tabs and spaces :)

13 years agoJust removing some trailing whitespace
Christopher Allan Webber [Mon, 4 Jul 2011 13:47:28 +0000 (08:47 -0500)]
Just removing some trailing whitespace

13 years agoCheck user['_id'] instead of username, which is slightly more guaranteed
Christopher Allan Webber [Mon, 4 Jul 2011 13:47:02 +0000 (08:47 -0500)]
Check user['_id'] instead of username, which is slightly more guaranteed

13 years agobug#422_user_can_not_edit_own_profile_unless_admin
Caleb Forbes Davis V [Mon, 4 Jul 2011 04:59:11 +0000 (23:59 -0500)]
bug#422_user_can_not_edit_own_profile_unless_admin

user != username.....

13 years agoFixing the symlinks for these CSS files
Christopher Allan Webber [Sun, 3 Jul 2011 22:38:28 +0000 (17:38 -0500)]
Fixing the symlinks for these CSS files

Not everyone runs mediagoblin out of
/home/jef/env/mediagoblin/src/schendjes-mediagoblin/ ;)

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.