mediagoblin.git
12 years agoSQL Model: Add relationship properties
Elrond [Sat, 24 Dec 2011 15:00:05 +0000 (16:00 +0100)]
SQL Model: Add relationship properties

MediaEntry now has a get_uploader (property) loading the
appropiate User object for the MediaEntry (and caches it).
MediaComment has the same for author as get_author.

12 years agoSQL Model: Forgot MediaEntry.state field
Elrond [Sat, 24 Dec 2011 17:12:38 +0000 (18:12 +0100)]
SQL Model: Forgot MediaEntry.state field

While creating the new SQL model, the "state" field of
MediaEntry was left out. Currently using a plain unicode
string for it.

Maybe should use sqlalchemy.types.Enum?

12 years agoImplement _id proxy on sql objects (on User for now)
Elrond [Sun, 25 Dec 2011 19:03:11 +0000 (20:03 +0100)]
Implement _id proxy on sql objects (on User for now)

So that the old code can access the primary key still as
"._id".

Quite simple Python Descriptor thing.
Very generic.

12 years agoTurn media.get_uploader into a property
Elrond [Fri, 23 Dec 2011 23:08:28 +0000 (00:08 +0100)]
Turn media.get_uploader into a property

sqlalchemy gives autoloading (hopefully caching) link to
other objects as properties. So turn get_uploader on the
current mongo based stuff into a property to ease
transition.

12 years agoUse media.url_for_self instead of calling urlgen directly
Elrond [Tue, 20 Dec 2011 17:47:33 +0000 (18:47 +0100)]
Use media.url_for_self instead of calling urlgen directly

Replace
urlgen('ID', user=media.get_uploader().username, media=media.*)
by
media.url_for_self(urlgen)
in a few places.
It's just a lot nicer!

12 years agoMove verification key generation to view
Elrond [Sun, 25 Dec 2011 19:11:09 +0000 (20:11 +0100)]
Move verification key generation to view

Instead of creating the email verication key on the db
model as a default for the field, create it in the
registration view.
Now all verification key generation is only in
auth/views.py!

12 years agoTranslate one string
Elrond [Sun, 25 Dec 2011 18:58:37 +0000 (19:58 +0100)]
Translate one string

"There doesn't seem to be any media here yet..." is now
translated also here (it's already in the list from another
place).

12 years agoReplace media.get_uploader()._id by media.uploader
Elrond [Mon, 19 Dec 2011 21:29:40 +0000 (22:29 +0100)]
Replace media.get_uploader()._id by media.uploader

media.get_uploader()._id loads a complete user object
without actually needing it, because media.uploader already
has the id!

12 years agoImprove .one() by using sqlalchemy's .one()
Elrond [Sat, 24 Dec 2011 17:19:40 +0000 (18:19 +0100)]
Improve .one() by using sqlalchemy's .one()

12 years agoAdd search level one() method
Elrond [Sat, 24 Dec 2011 18:08:20 +0000 (19:08 +0100)]
Add search level one() method

And create a _fix_query_dict which converts '_id' to 'id'.

12 years agoTurn MediaComment's author() into get_author property
Elrond [Sun, 18 Dec 2011 21:52:49 +0000 (22:52 +0100)]
Turn MediaComment's author() into get_author property

1) MediaComment's author method conflicts with the author
   field. So rename it to get_author.
2) Turn it from a normal function into a python property.
   That means you call it by ".get_author" not by
   ".get_author()". This is exactly what sqlalchemy gives
   us free of charge.

12 years agoadded translation tags to html5 wwarning
Karen Rustad [Thu, 22 Dec 2011 23:45:20 +0000 (15:45 -0800)]
added translation tags to html5 wwarning

12 years agoAdded a 'you don't have HTML5 so this video will not work' warning using just the...
Karen Rustad [Mon, 19 Dec 2011 06:50:36 +0000 (22:50 -0800)]
Added a 'you don't have HTML5 so this video will not work' warning using just the inherent properties of the <video> tag (and some css for style)

12 years agoNote reported bug in workaround
Elrond [Tue, 20 Dec 2011 23:34:02 +0000 (00:34 +0100)]
Note reported bug in workaround

So that the workaround can eventually be removed, note the
URL for the relevant bug in a comment.

12 years agoWorkaround for Routes/urlgen bug.
Elrond [Tue, 20 Dec 2011 23:06:38 +0000 (00:06 +0100)]
Workaround for Routes/urlgen bug.

This is relevant for fcgi:

Some servers (cherokee for example) put "HTTP":"off" in the
environ. And the following code in urlgen breaks on this:
    if environ.get('HTTPS') or environ.get('wsgi.url_scheme') == 'https' \
       or environ.get('HTTP_X_FORWARDED_PROTO') == 'https':
        hostinfo['protocol'] = 'https'

workaround is to remove HTTPS:off from the environ.

12 years agoMerge remote branch 'remotes/joar/webfinger'
Elrond [Tue, 20 Dec 2011 21:58:16 +0000 (22:58 +0100)]
Merge remote branch 'remotes/joar/webfinger'

* remotes/joar/webfinger:
  Added references to docstring in mediagoblin.webfinger
  Removed mediagoblin.tools.feed which was accidentally included
  Polishing the webfinger implementation
  webfinger fully compliant with webfinger.org! Still *preliminary* solution.
  Changed some thngs to be compatible with webfinger.org, still *very preliminary*
  Added *very preliminary* support for webfinger

12 years agoAdded references to docstring in mediagoblin.webfinger
Joar Wandborg [Tue, 20 Dec 2011 21:55:13 +0000 (22:55 +0100)]
Added references to docstring in mediagoblin.webfinger

and mediagoblin.webfinger.views [references mediagoblin.webfinger]

12 years agoRemoved mediagoblin.tools.feed which was accidentally included
Joar Wandborg [Tue, 20 Dec 2011 21:13:43 +0000 (22:13 +0100)]
Removed mediagoblin.tools.feed which was accidentally included

12 years agoPolishing the webfinger implementation
Joar Wandborg [Tue, 20 Dec 2011 21:06:36 +0000 (22:06 +0100)]
Polishing the webfinger implementation

- Changed quotes in the templates from " to '
- Changed all link generation to use request.urlgen
- Moved xrd links data generation from template to view
- Added parsing of the account URI using urlparse

12 years agoMove db/models.py -> db/mongo/models.py
Elrond [Tue, 20 Dec 2011 19:41:21 +0000 (20:41 +0100)]
Move db/models.py -> db/mongo/models.py

To my surprise, there was only ONE reference to models.py.
From open.py.

12 years agoMove db/migrations.py -> db/mongo/migrations.py
Elrond [Tue, 20 Dec 2011 19:33:33 +0000 (20:33 +0100)]
Move db/migrations.py -> db/mongo/migrations.py

And change references.

12 years agoMove db/util.py -> db/mongo/util.py
Elrond [Tue, 20 Dec 2011 18:35:47 +0000 (19:35 +0100)]
Move db/util.py -> db/mongo/util.py

- Change some reference
- Provide a wrapper db/util.py

12 years agoMove db/indexes.py to db/mongo/indexes.py
Elrond [Tue, 20 Dec 2011 18:20:09 +0000 (19:20 +0100)]
Move db/indexes.py to db/mongo/indexes.py

And change references (one!).

12 years agoMove db/open.py to db/mongo/open.py
Elrond [Tue, 20 Dec 2011 18:06:04 +0000 (19:06 +0100)]
Move db/open.py to db/mongo/open.py

Starting to move the mongo specific stuff into db/mongo.
And create thin "from db.mongo.Y import z" wrappers in
db/Y.py.

Why?
1) Will make it lots easier to switch to sql for
   testing/developing.
2) The mongo stuff needs to stay around after moving to
   sql, because the converter needs it.

12 years agoSQL: mongokit like interface
Elrond [Sun, 18 Dec 2011 16:02:27 +0000 (17:02 +0100)]
SQL: mongokit like interface

In trying to ease the migration to SQL, created an
interface to sqlalchemy that looks a lot like the interface
that is currently in use.

*WARNING* Work in progress

12 years agoShow actual comment number. Only shows plural for now (ticket #712)
Jef van Schendel [Sat, 17 Dec 2011 23:31:39 +0000 (00:31 +0100)]
Show actual comment number. Only shows plural for now (ticket #712)

12 years agoSimple Mongo -> SQL migration tool
Elrond [Sat, 17 Dec 2011 20:37:02 +0000 (21:37 +0100)]
Simple Mongo -> SQL migration tool

This is just a start at a Migration tool from Mongo to SQL.
It fills all currently available SQL models with data from
MongoDB. A few fields in the SQL tables are left out,
because some data format migrations are needed (notably:
queue_file_name).

This thing lives in mediagoblin/db/sql/convert.py because
it has a lot of stuff hardcoded and is not, repeat not for
end users!

Hard coded:
- output database: ./mediagoblin.db (sqlite)
- Mediagoblin config: ./mediagoblin.ini

12 years agoLittle sql model update
Elrond [Sat, 17 Dec 2011 16:34:55 +0000 (17:34 +0100)]
Little sql model update

- Add title to the MediaEntry
- Rename fp_verification_expire to fp_token_expire to
  follow the mongo model.

12 years agoFixed import_export
Joar Wandborg [Thu, 15 Dec 2011 22:49:52 +0000 (23:49 +0100)]
Fixed import_export

- Mongokit instead of pymongo
- db.MediaEntry instead of db.media_entry (pymongo style)

12 years agoSQL: Some toys and little fix
Elrond [Thu, 15 Dec 2011 21:11:49 +0000 (22:11 +0100)]
SQL: Some toys and little fix

Run bin/python mediagoblin/db/sql/models.py and watch the
create tables on a memory sqlite db.

Also unicode strings need unicode defauls. Warning by
sqlalchemy.

12 years agoMove sql models into db/sql/
Elrond [Thu, 15 Dec 2011 20:15:21 +0000 (21:15 +0100)]
Move sql models into db/sql/

So we can play with the sql models, let's put them in a
proper place.

12 years agoMerge remote branch 'remotes/cwebber/sqlalchemy'
Elrond [Thu, 15 Dec 2011 20:10:01 +0000 (21:10 +0100)]
Merge remote branch 'remotes/cwebber/sqlalchemy'

* remotes/cwebber/sqlalchemy:
  Beginnings of sqlalchemy models

12 years agowebfinger fully compliant with webfinger.org! Still *preliminary* solution.
Joar Wandborg [Thu, 15 Dec 2011 18:35:53 +0000 (19:35 +0100)]
webfinger fully compliant with webfinger.org! Still *preliminary* solution.

12 years agoFix -dev version and add version number docs
Will Kahn-Greene [Thu, 15 Dec 2011 14:27:56 +0000 (09:27 -0500)]
Fix -dev version and add version number docs

Version numbers should adhere to PEP-386.

12 years agoChanged some thngs to be compatible with webfinger.org, still *very preliminary*
Joar Wandborg [Wed, 14 Dec 2011 23:58:14 +0000 (00:58 +0100)]
Changed some thngs to be compatible with webfinger.org, still *very preliminary*

12 years agoAdded *very preliminary* support for webfinger
Joar Wandborg [Wed, 14 Dec 2011 23:46:10 +0000 (00:46 +0100)]
Added *very preliminary* support for webfinger

12 years agoChange "Submit" to "Add" for ticket #466
Jef van Schendel [Wed, 14 Dec 2011 15:42:40 +0000 (16:42 +0100)]
Change "Submit" to "Add" for ticket #466

12 years agoRemove "X license" placeholder from media page
Jef van Schendel [Wed, 14 Dec 2011 15:36:29 +0000 (16:36 +0100)]
Remove "X license" placeholder from media page

12 years agoChange wording for change_fp; improved the button text
Jef van Schendel [Wed, 14 Dec 2011 15:18:26 +0000 (16:18 +0100)]
Change wording for change_fp; improved the button text

12 years agoMerge remote branch 'joar/b681-comments_from_reviewing_video'
Elrond [Tue, 13 Dec 2011 20:35:15 +0000 (21:35 +0100)]
Merge remote branch 'joar/b681-comments_from_reviewing_video'

* joar/b681-comments_from_reviewing_video:
  Bug 681 - Comments from reviewing the new video merge

12 years agoMerge jQuery branch, resolve conflicts
Jef van Schendel [Tue, 13 Dec 2011 14:15:57 +0000 (15:15 +0100)]
Merge jQuery branch, resolve conflicts

12 years agoMerge branch 'sql/dot-notation'
Elrond [Mon, 12 Dec 2011 17:53:03 +0000 (18:53 +0100)]
Merge branch 'sql/dot-notation'

* sql/dot-notation:
  Dot-Notation for MediaEntry.media_data
  Dot-Notation for MediaEntry.media_type
  Dot-Notation for MediaEntry.description(_html)
  Dot-Notation for MediaEntry.slug
  Dot-Notation for MediaEntry.title
  Dot-Notation for MediaEntry.uploader
  Dot-Notation for MediaEntry.created
  Dot-Notation: tests/test_edit.py
  Dot-Notation for Users.fp_token_expire
  Dot-Notation for Users.fp_verification_key
  Dot-Notation for Users.bio and .bio_html
  Dot-Notation for Users.url
  Dot-Notation for Users.is_admin
  Dot-Notation for Users.verification_key
  Dot-Notation for Users.status
  Dot-Notation for Users.email_verified
  Dot-Notation for Users.pw_hash
  Dot-Notation for Users.email
  Dot-Notation for Users.username

12 years agoChanger version to -dev
Will Kahn-Greene [Mon, 12 Dec 2011 16:52:24 +0000 (11:52 -0500)]
Changer version to -dev

12 years agoUpdate version numbers
Will Kahn-Greene [Mon, 12 Dec 2011 16:41:29 +0000 (11:41 -0500)]
Update version numbers

12 years agoFix doc footer
Will Kahn-Greene [Mon, 12 Dec 2011 16:12:59 +0000 (11:12 -0500)]
Fix doc footer

This has the correct copyright statement.

12 years agoTweak rest formatting
Will Kahn-Greene [Mon, 12 Dec 2011 15:48:24 +0000 (10:48 -0500)]
Tweak rest formatting

12 years agoUpdated translations
Christopher Allan Webber [Mon, 12 Dec 2011 15:45:45 +0000 (09:45 -0600)]
Updated translations

12 years agoAdded the "Media types" chapter
Christopher Allan Webber [Mon, 12 Dec 2011 15:44:48 +0000 (09:44 -0600)]
Added the "Media types" chapter

12 years agoDoc updates
Will Kahn-Greene [Mon, 12 Dec 2011 15:20:05 +0000 (10:20 -0500)]
Doc updates

* fixed some language
* fixed some consistency issues
* fixed some 80-line-width issues
* fixed some typos and markup problems

12 years agoAdd some documentation to lazyserver.sh
Will Kahn-Greene [Mon, 12 Dec 2011 15:17:03 +0000 (10:17 -0500)]
Add some documentation to lazyserver.sh

I had no idea what it did, so I asked and tossed the answer at the
top of the script.

12 years agoUpdate README
Will Kahn-Greene [Mon, 12 Dec 2011 14:53:41 +0000 (09:53 -0500)]
Update README

* tweaked some language
* fixed some statements that aren't correct anymore

12 years agoTweak runtests to be more helpful
Will Kahn-Greene [Mon, 12 Dec 2011 14:46:23 +0000 (09:46 -0500)]
Tweak runtests to be more helpful

If nose isn't installed, then runtests.sh says it can't find nosetests
and exits, but doesn't tell you what you need to do to fix the situation.
This fixes that.

12 years agoRemoved extraneous whitespace from video.html
Christopher Allan Webber [Mon, 12 Dec 2011 14:15:16 +0000 (08:15 -0600)]
Removed extraneous whitespace from video.html

12 years agoAdd a note on how to up the upload size limit
Christopher Allan Webber [Mon, 12 Dec 2011 14:13:46 +0000 (08:13 -0600)]
Add a note on how to up the upload size limit

12 years agoAllow administrators to disable keeping the original. That's the new default!
Christopher Allan Webber [Mon, 12 Dec 2011 14:10:10 +0000 (08:10 -0600)]
Allow administrators to disable keeping the original.  That's the new default!

12 years agoMark "newer/older" buttons for translation
Christopher Allan Webber [Mon, 12 Dec 2011 13:35:47 +0000 (07:35 -0600)]
Mark "newer/older" buttons for translation

12 years agoStyle changes for media_uploader (now media_specs); removed margins from button_actio...
Jef van Schendel [Sat, 10 Dec 2011 20:03:18 +0000 (21:03 +0100)]
Style changes for media_uploader (now media_specs); removed margins from button_action buttons

12 years agoRemove pagination images and replace them with unicode characters
Jef van Schendel [Sat, 10 Dec 2011 18:58:02 +0000 (19:58 +0100)]
Remove pagination images and replace them with unicode characters

12 years agoChange wording in tags.html
Jef van Schendel [Fri, 9 Dec 2011 22:47:11 +0000 (23:47 +0100)]
Change wording in tags.html

12 years agoOpen Markdown link in new windows; I know _blank is sometimes frowned upon but it...
Jef van Schendel [Fri, 9 Dec 2011 21:48:20 +0000 (22:48 +0100)]
Open Markdown link in new windows; I know _blank is sometimes frowned upon but it may be useful here

12 years agoOnly apply textarea style to comment box
Jef van Schendel [Fri, 9 Dec 2011 21:45:26 +0000 (22:45 +0100)]
Only apply textarea style to comment box

12 years agoLots of changes to media page; rearranged things, added new styles, added jquery...
Jef van Schendel [Fri, 9 Dec 2011 21:37:20 +0000 (22:37 +0100)]
Lots of changes to media page; rearranged things, added new styles, added jquery bits, gave the comment section a refresh

12 years agoMove author text, "By X", to the sidebar
Jef van Schendel [Wed, 7 Dec 2011 21:15:48 +0000 (22:15 +0100)]
Move author text, "By X", to the sidebar

12 years agoBug 681 - Comments from reviewing the new video merge
Joar Wandborg [Tue, 6 Dec 2011 22:05:47 +0000 (23:05 +0100)]
Bug 681 - Comments from reviewing the new video merge

in mediagoblin.media_types and submodules

- Moved VideoThumbnailer.errors initialization to VideoThumbnailer.__init__
- Cleaned up the image.processing imports
- Removed default ``None`` from get_media_manager(_media_type)

in mediagoblin.views
- Removed media_types import
- Removed sys import, and passing of sys to root.html template

12 years agoDot-Notation for MediaEntry.media_data
Elrond [Sun, 4 Dec 2011 19:26:36 +0000 (20:26 +0100)]
Dot-Notation for MediaEntry.media_data

12 years agoDot-Notation for MediaEntry.media_type
Elrond [Sun, 4 Dec 2011 19:16:01 +0000 (20:16 +0100)]
Dot-Notation for MediaEntry.media_type

12 years agoDot-Notation for MediaEntry.description(_html)
Elrond [Sun, 4 Dec 2011 19:06:42 +0000 (20:06 +0100)]
Dot-Notation for MediaEntry.description(_html)

12 years agoDot-Notation for MediaEntry.slug
Elrond [Sun, 4 Dec 2011 18:57:42 +0000 (19:57 +0100)]
Dot-Notation for MediaEntry.slug

12 years agoDot-Notation for MediaEntry.title
Elrond [Tue, 22 Nov 2011 23:10:42 +0000 (00:10 +0100)]
Dot-Notation for MediaEntry.title

12 years agoDot-Notation for MediaEntry.uploader
Elrond [Mon, 21 Nov 2011 19:18:38 +0000 (20:18 +0100)]
Dot-Notation for MediaEntry.uploader

12 years agoDot-Notation for MediaEntry.created
Elrond [Mon, 14 Nov 2011 17:39:18 +0000 (18:39 +0100)]
Dot-Notation for MediaEntry.created

12 years agoDot-Notation: tests/test_edit.py
Elrond [Mon, 21 Nov 2011 11:56:26 +0000 (12:56 +0100)]
Dot-Notation: tests/test_edit.py

convert tests/test_edit.py over to Dot-Notation. It only
accesses the User object.

12 years agoDot-Notation for Users.fp_token_expire
Elrond [Mon, 14 Nov 2011 18:24:15 +0000 (19:24 +0100)]
Dot-Notation for Users.fp_token_expire

12 years agoDot-Notation for Users.fp_verification_key
Elrond [Mon, 14 Nov 2011 18:21:33 +0000 (19:21 +0100)]
Dot-Notation for Users.fp_verification_key

12 years agoDot-Notation for Users.bio and .bio_html
Elrond [Mon, 14 Nov 2011 18:19:54 +0000 (19:19 +0100)]
Dot-Notation for Users.bio and .bio_html

12 years agoDot-Notation for Users.url
Elrond [Mon, 14 Nov 2011 18:16:02 +0000 (19:16 +0100)]
Dot-Notation for Users.url

12 years agoDot-Notation for Users.is_admin
Elrond [Mon, 14 Nov 2011 18:08:43 +0000 (19:08 +0100)]
Dot-Notation for Users.is_admin

12 years agoDot-Notation for Users.verification_key
Elrond [Mon, 14 Nov 2011 18:04:13 +0000 (19:04 +0100)]
Dot-Notation for Users.verification_key

12 years agoDot-Notation for Users.status
Elrond [Mon, 14 Nov 2011 18:01:26 +0000 (19:01 +0100)]
Dot-Notation for Users.status

12 years agoDot-Notation for Users.email_verified
Elrond [Mon, 14 Nov 2011 17:54:52 +0000 (18:54 +0100)]
Dot-Notation for Users.email_verified

12 years agoDot-Notation for Users.pw_hash
Elrond [Mon, 14 Nov 2011 17:49:21 +0000 (18:49 +0100)]
Dot-Notation for Users.pw_hash

12 years agoDot-Notation for Users.email
Elrond [Mon, 14 Nov 2011 16:22:33 +0000 (17:22 +0100)]
Dot-Notation for Users.email

12 years agoDot-Notation for Users.username
Elrond [Mon, 14 Nov 2011 14:39:57 +0000 (15:39 +0100)]
Dot-Notation for Users.username

12 years agoUpdate comment URLs to use the media slug.
Christopher Allan Webber [Mon, 5 Dec 2011 14:37:20 +0000 (08:37 -0600)]
Update comment URLs to use the media slug.

12 years agoUpdate the delete item to use the _id after all... it's the safest way.
Christopher Allan Webber [Mon, 5 Dec 2011 14:35:42 +0000 (08:35 -0600)]
Update the delete item to use the _id after all... it's the safest way.

See http://bugs.foocorp.net/issues/695

12 years agoCloudfiles not actually a dependency, removing from setup.py
Christopher Allan Webber [Mon, 5 Dec 2011 05:58:58 +0000 (23:58 -0600)]
Cloudfiles not actually a dependency, removing from setup.py

If users want cloudfiles, they can always ./bin/easy_install it.

12 years agoMerge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Christopher Allan Webber [Mon, 5 Dec 2011 05:14:08 +0000 (23:14 -0600)]
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html

12 years agoDOCS:: #675 revision to deployment and production documents
tycho garen [Sun, 4 Dec 2011 22:06:54 +0000 (17:06 -0500)]
DOCS:: #675 revision to deployment and production documents

12 years agoFilled in reason #3 to submit separate out celery.
Christopher Allan Webber [Sun, 4 Dec 2011 21:27:00 +0000 (15:27 -0600)]
Filled in reason #3 to submit separate out celery.

12 years agoFix button word-wrapping issue
Christopher Allan Webber [Sun, 4 Dec 2011 20:39:42 +0000 (14:39 -0600)]
Fix button word-wrapping issue

12 years agoMerge remote-tracking branch 'tychoish/master'
Christopher Allan Webber [Sun, 4 Dec 2011 19:59:13 +0000 (13:59 -0600)]
Merge remote-tracking branch 'tychoish/master'

12 years agoCompiled the .mo files too
Christopher Allan Webber [Sun, 4 Dec 2011 19:57:35 +0000 (13:57 -0600)]
Compiled the .mo files too

12 years agoUpdated translations
Christopher Allan Webber [Sun, 4 Dec 2011 19:56:55 +0000 (13:56 -0600)]
Updated translations

12 years agoDOCS: update to deployment documentation and new production deployments doc
tycho garen [Sun, 4 Dec 2011 19:51:00 +0000 (14:51 -0500)]
DOCS: update to deployment documentation and new production deployments doc

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agoRemoving the conditional that checks if there's a media in media.html
Christopher Allan Webber [Sun, 4 Dec 2011 16:24:42 +0000 (10:24 -0600)]
Removing the conditional that checks if there's a media in media.html

If there isn't a media, we shouldn't hit that template!  The view
should ensure that.

12 years agoChange "Your finest source of goblin related media" to something else
Christopher Allan Webber [Sun, 4 Dec 2011 16:21:58 +0000 (10:21 -0600)]
Change "Your finest source of goblin related media" to something else

We don't want to insist everyone hold a goblin-related gallery :)

12 years agoMerge branch 'misc/fixture_add_user'
Elrond [Sun, 4 Dec 2011 13:59:33 +0000 (14:59 +0100)]
Merge branch 'misc/fixture_add_user'

* misc/fixture_add_user:
  fixture_add_user: Factoring a unit test tool

12 years agoMost users won't see this but having space after prompt still nice for passwords.
Christopher Allan Webber [Sun, 4 Dec 2011 03:59:52 +0000 (21:59 -0600)]
Most users won't see this but having space after prompt still nice for passwords.

12 years agoPEP-8'ifying prompt_if_not_set
Christopher Allan Webber [Sun, 4 Dec 2011 03:56:30 +0000 (21:56 -0600)]
PEP-8'ifying prompt_if_not_set