mediagoblin.git
13 years agoMoved a div around
Jef van Schendel [Mon, 25 Jul 2011 20:19:22 +0000 (22:19 +0200)]
Moved a div around

13 years agoOk, so here are the actual changes. Woops!
Jef van Schendel [Mon, 25 Jul 2011 19:26:58 +0000 (21:26 +0200)]
Ok, so here are the actual changes. Woops!

13 years agoAssorted style changes, small base.html changes, added new background image
Jef van Schendel [Mon, 25 Jul 2011 19:25:34 +0000 (21:25 +0200)]
Assorted style changes, small base.html changes, added new background image

13 years agoUser profile had the wrong {% else %} nesting.
Christopher Allan Webber [Sun, 24 Jul 2011 20:06:16 +0000 (15:06 -0500)]
User profile had the wrong {% else %} nesting.

Thanks for the patch Velmont / Odin Hørthe Omdal!

13 years agoAdd html doctype
Christopher Allan Webber [Sun, 24 Jul 2011 20:04:49 +0000 (15:04 -0500)]
Add html doctype

Thanks for the patch Velmont / Odin Hørthe Omdal!

13 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Sun, 24 Jul 2011 19:56:39 +0000 (14:56 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

13 years agoMake charset utf-8.
Christopher Allan Webber [Sun, 24 Jul 2011 19:52:36 +0000 (14:52 -0500)]
Make charset utf-8.

Thanks for the patch Velmont / Odin Hørthe Omdal!

13 years ago333. Adds text about naming bugfix branches
Will Kahn-Greene [Sun, 24 Jul 2011 19:19:38 +0000 (15:19 -0400)]
333. Adds text about naming bugfix branches

13 years agoMerge remote branch 'remotes/elrond/dev/init'
Christopher Allan Webber [Sun, 17 Jul 2011 23:58:32 +0000 (18:58 -0500)]
Merge remote branch 'remotes/elrond/dev/init'

13 years agodocstring for MediaComment's structure
Christopher Allan Webber [Sun, 17 Jul 2011 22:06:06 +0000 (17:06 -0500)]
docstring for MediaComment's structure

13 years agoDescribed the MediaEntry structure in the docstring.
Christopher Allan Webber [Sun, 17 Jul 2011 21:51:36 +0000 (16:51 -0500)]
Described the MediaEntry structure in the docstring.

13 years agoDocstring for the User model's various schema fields
Christopher Allan Webber [Sun, 17 Jul 2011 20:48:44 +0000 (15:48 -0500)]
Docstring for the User model's various schema fields

13 years agoAdded instructions on how to run mongod --repair
Christopher Allan Webber [Sun, 17 Jul 2011 17:02:13 +0000 (12:02 -0500)]
Added instructions on how to run mongod --repair

13 years agoDocs: fixing an issue with being unable to install with distribute installed already
Christopher Allan Webber [Sun, 17 Jul 2011 16:36:56 +0000 (11:36 -0500)]
Docs: fixing an issue with being unable to install with distribute installed already

Basically, use "python bootstrap.py --distribute" if you get DistributionNotFound: distribute

13 years agoFinished the docstring of the creature_add_magical_powers fake migration
Christopher Allan Webber [Sun, 17 Jul 2011 16:32:05 +0000 (11:32 -0500)]
Finished the docstring of the creature_add_magical_powers fake migration

13 years agoMove application level setup of database to init/
Elrond [Sun, 17 Jul 2011 15:45:50 +0000 (17:45 +0200)]
Move application level setup of database to init/

Setting up the database now involves checking the
migrations status and setting up the globals.
Moved all of that into init/__init__.py:setup_database().

13 years agoMigration for mediafiles main->original
Christopher Allan Webber [Sun, 17 Jul 2011 13:50:09 +0000 (08:50 -0500)]
Migration for mediafiles main->original

13 years agoMerge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
Christopher Allan Webber [Sat, 16 Jul 2011 21:28:12 +0000 (16:28 -0500)]
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/process_media/__init__.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py

13 years agoMerge remote branch 'remotes/cmoylan/test_submission_views_365'
Christopher Allan Webber [Sat, 16 Jul 2011 20:05:54 +0000 (15:05 -0500)]
Merge remote branch 'remotes/cmoylan/test_submission_views_365'

13 years agoChanges clone url from http url to git url
Will Kahn-Greene [Fri, 15 Jul 2011 16:32:21 +0000 (12:32 -0400)]
Changes clone url from http url to git url

Cloning over http is always yuckier than cloning over git protocol.

13 years agoUse cleaned_markdown_conversion in both cases in edit/views.py
Christopher Allan Webber [Thu, 14 Jul 2011 05:40:16 +0000 (00:40 -0500)]
Use cleaned_markdown_conversion in both cases in edit/views.py

13 years agoapp.py and migrate.py must import migrations in order to load said migrations...
Christopher Allan Webber [Thu, 14 Jul 2011 05:32:01 +0000 (00:32 -0500)]
app.py and migrate.py must import migrations in order to load said migrations...

13 years agoFirst migration: Add markdown bio!
Christopher Allan Webber [Thu, 14 Jul 2011 05:00:24 +0000 (00:00 -0500)]
First migration: Add markdown bio!

13 years agoIndenting section in the autoscape block
Christopher Allan Webber [Thu, 14 Jul 2011 04:20:16 +0000 (23:20 -0500)]
Indenting section in the autoscape block

13 years agoMerge remote branch 'remotes/aaronw/feature410_markdown_bio'
Christopher Allan Webber [Thu, 14 Jul 2011 04:19:46 +0000 (23:19 -0500)]
Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

13 years agoMerge branch 'master' into f411_new_migrations
Christopher Allan Webber [Thu, 14 Jul 2011 04:14:42 +0000 (23:14 -0500)]
Merge branch 'master' into f411_new_migrations

Conflicts:
mediagoblin/db/open.py

13 years agoDuplicate migration numbers not allowed, bro
Christopher Allan Webber [Thu, 14 Jul 2011 03:32:51 +0000 (22:32 -0500)]
Duplicate migration numbers not allowed, bro

13 years agoMerge branch 'master' into test_submission_views_365
Chris Moylan [Thu, 14 Jul 2011 02:58:25 +0000 (21:58 -0500)]
Merge branch 'master' into test_submission_views_365

13 years agoElrond thinks we should use one of print/sys.stdout.write and .flush()
Christopher Allan Webber [Thu, 14 Jul 2011 02:14:31 +0000 (21:14 -0500)]
Elrond thinks we should use one of print/sys.stdout.write and .flush()

I don't see the harm, so... done.

13 years agoA couple of tests related to migrations_to_run()
Christopher Allan Webber [Thu, 14 Jul 2011 02:09:04 +0000 (21:09 -0500)]
A couple of tests related to migrations_to_run()

Includes a test making sure an exception is raised if
current_migration not set in database

13 years agoWe should *raise* MissingCurrentMigration :)
Christopher Allan Webber [Thu, 14 Jul 2011 01:58:13 +0000 (20:58 -0500)]
We should *raise* MissingCurrentMigration :)

Thanks for the catch, Elrond.

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 agoRemoving old style migrations... not in use anymore
Christopher Allan Webber [Tue, 12 Jul 2011 02:09:36 +0000 (21:09 -0500)]
Removing old style migrations... not in use anymore

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 agoJust making a note of where the new migrations will go!
Christopher Allan Webber [Mon, 11 Jul 2011 03:58:48 +0000 (22:58 -0500)]
Just making a note of where the new migrations will go!

13 years agoSetup the application to record the database version if missing on launch
Christopher Allan Webber [Mon, 11 Jul 2011 03:50:03 +0000 (22:50 -0500)]
Setup the application to record the database version if missing on launch

13 years agoMerge branch 'master' into test_submission_views_365
Chris Moylan [Mon, 11 Jul 2011 03:45:52 +0000 (22:45 -0500)]
Merge branch 'master' into test_submission_views_365

13 years agoadded suggestions as per http://bugs.foocorp.net/issues/365#note-9
Chris Moylan [Mon, 11 Jul 2011 03:45:27 +0000 (22:45 -0500)]
added suggestions as per bugs.foocorp.net/issues/365#note-9

13 years agoUse new migrations system in ./bin/gmg migrate
Christopher Allan Webber [Mon, 11 Jul 2011 03:44:33 +0000 (22:44 -0500)]
Use new migrations system in ./bin/gmg migrate

13 years agogive option in connect_database_from_config to connect to a pymongo.Connection
Christopher Allan Webber [Mon, 11 Jul 2011 03:44:20 +0000 (22:44 -0500)]
give option in connect_database_from_config to connect to a pymongo.Connection

13 years agoMade it so that it's migrate_new() which installs the migration
Christopher Allan Webber [Mon, 11 Jul 2011 03:02:51 +0000 (22:02 -0500)]
Made it so that it's migrate_new() which installs the migration
version if missing, migrations_to_run just throws an error if not set

13 years agotest_migrations_recorded_as_(latest|zero) tests passing :)
Christopher Allan Webber [Mon, 11 Jul 2011 02:51:02 +0000 (21:51 -0500)]
test_migrations_recorded_as_(latest|zero) tests passing :)

13 years agotest_run_partial_migrations() working!
Christopher Allan Webber [Mon, 11 Jul 2011 02:29:23 +0000 (21:29 -0500)]
test_run_partial_migrations() working!

13 years agoMarkdown-enable user bio (Feature 410)
Aaron Williamson [Mon, 11 Jul 2011 02:28:48 +0000 (22:28 -0400)]
Markdown-enable user bio (Feature 410)

13 years agotesting tools install_fixtures_simple and assert_db_meets_expected
Christopher Allan Webber [Mon, 11 Jul 2011 02:16:50 +0000 (21:16 -0500)]
testing tools install_fixtures_simple and assert_db_meets_expected

Thought I installed these... guess I didn't!

13 years agotest_run_full_migrations() all working properly!
Christopher Allan Webber [Mon, 11 Jul 2011 02:14:38 +0000 (21:14 -0500)]
test_run_full_migrations() all working properly!

13 years agoNo reason to have migration_number optional or default to None
Christopher Allan Webber [Sun, 10 Jul 2011 23:48:09 +0000 (18:48 -0500)]
No reason to have migration_number optional or default to None

13 years agoMock out tests, define expected results, add first test
Christopher Allan Webber [Sun, 10 Jul 2011 23:46:48 +0000 (18:46 -0500)]
Mock out tests, define expected results, add first test

Specifically test_migrations_registered_and_sorted() :)

13 years agoMove the call to install_migration_version_if_missing() to migrations_to_run()
Christopher Allan Webber [Sun, 10 Jul 2011 23:43:08 +0000 (18:43 -0500)]
Move the call to install_migration_version_if_missing() to migrations_to_run()

This means there's a serious side effect of calling this, but there's
no way to get useful data here unless if that's set anyway.

13 years agoinstall_migration_version_if_missing() now a separate function
Christopher Allan Webber [Sun, 10 Jul 2011 23:27:38 +0000 (18:27 -0500)]
install_migration_version_if_missing() now a separate function

Also added it to MigrationManager.migrate_new(), because we'll always
need a migration number when migrating.

13 years agoMake sure all these strings in db/util.py are unicode
Christopher Allan Webber [Sun, 10 Jul 2011 21:23:36 +0000 (16:23 -0500)]
Make sure all these strings in db/util.py are unicode

13 years agoAdded the actual fake/testing migrations. Haven't run them yet...
Christopher Allan Webber [Sun, 10 Jul 2011 21:19:49 +0000 (16:19 -0500)]
Added the actual fake/testing migrations.  Haven't run them yet...

13 years agoSimpler run_migrations method.
Christopher Allan Webber [Sun, 10 Jul 2011 20:41:18 +0000 (15:41 -0500)]
Simpler run_migrations method.

Allows for calbacks, should be useful for printing output and catching
things in tests.

Gets rid of the generator stuff which now that I think of it is a
messy idea.

13 years agotest_migrations.py w/ migrate'able fixtures and some migration scaffolding
Christopher Allan Webber [Sun, 10 Jul 2011 20:28:46 +0000 (15:28 -0500)]
test_migrations.py w/ migrate'able fixtures and some migration scaffolding

Not usable yet, but fleshing out well!

13 years agoMaking sure migration_number > 0 :)
Christopher Allan Webber [Sat, 9 Jul 2011 23:17:54 +0000 (18:17 -0500)]
Making sure migration_number > 0 :)

13 years agorun_new_migrations() makes more sense
Christopher Allan Webber [Sat, 9 Jul 2011 22:21:47 +0000 (17:21 -0500)]
run_new_migrations() makes more sense

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 agoSome instructions in the RegisterMigration docstring on how to use.
Christopher Allan Webber [Sat, 9 Jul 2011 20:10:47 +0000 (15:10 -0500)]
Some instructions in the RegisterMigration docstring on how to use.

13 years agolatest_migration now returns migration numbers only, and 0 if no migrations.
Christopher Allan Webber [Sat, 9 Jul 2011 20:07:40 +0000 (15:07 -0500)]
latest_migration now returns migration numbers only, and 0 if no migrations.

13 years agoMigrating quietly, not iteratively, that comment should say!
Christopher Allan Webber [Sat, 9 Jul 2011 19:51:48 +0000 (14:51 -0500)]
Migrating quietly, not iteratively, that comment should say!

13 years agoNew migration utility code.... I haven't tested this! ;)
Christopher Allan Webber [Sat, 9 Jul 2011 19:50:41 +0000 (14:50 -0500)]
New migration utility code.... I haven't tested this! ;)

I think it's looking right though.
 - Provides MigrationManager which should have plenty of utilities for
   doing migrations hopefully correctly :)
 - Provides RegisterMigration which should be able to decorate
   migrations and register them in doing so

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'