Christopher Allan Webber 73079ac4b8 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin ...

Conflicts:
	mediagoblin/db/mongo/models.py

2012-01-10 08:12:30 -06:00

..

auth

Remove fp_changed_success.html, use log in page + notification message instead

2012-01-01 19:13:23 +01:00

db

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

2012-01-10 08:12:30 -06:00

edit

Make show-password-js work for change password too

2012-01-05 14:47:15 +01:00

gmg_commands

Dot-Notation for MediaEntry.media_files

2012-01-04 11:57:39 +01:00

i18n

Committing extracted and compiled translations

2012-01-07 13:48:12 -06:00

init

Factor out check_db_migrations_current

2012-01-01 18:36:42 +01:00

listings

Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)

2012-01-10 08:10:53 -06:00

meddleware

Bug #685: only provide CSRF token if it exists

2011-12-03 21:25:55 +01:00

media_types

Dot-Notation for MediaEntry.queued_media_file

2012-01-04 11:57:39 +01:00

static

Fix div breaking in user.html; add media query bits

2012-01-06 13:44:00 +01:00

storage

Merge branch 'video_gstreamer-only'

2011-11-21 21:51:30 +01:00

submit

Add Markdown for submit page, edit page, profile edit page; thus fixing ticket #690

2012-01-04 17:48:16 +01:00

templates/mediagoblin

Added check for request.user to media.html attachment-related conditional

2012-01-10 13:12:14 +01:00

tests

Test Suite: Enable attachments, add failing test

2012-01-10 12:52:01 +01:00

tools

f691: Use StrictUndefined for templates and fix some issues

2012-01-04 23:56:16 +01:00

user_pages

Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)

2012-01-10 08:10:53 -06:00

webfinger

Added references to docstring in mediagoblin.webfinger

2011-12-20 22:55:13 +01:00

__init__.py

508. Updates copyright/license information

2011-09-01 20:50:19 -04:00

_version.py

Fix -dev version and add version number docs

2011-12-15 09:28:48 -05:00

app.py

Note reported bug in workaround

2011-12-21 00:34:02 +01:00

buildout_recipes.py

508. Updates copyright/license information

2011-09-01 20:50:19 -04:00

config_spec.ini

Allow administrators to disable keeping the original. That's the new default!

2011-12-12 08:10:10 -06:00

decorators.py

Replace media.get_uploader()._id by media.uploader

2011-12-24 19:27:29 +01:00

errormiddleware.py

508. Updates copyright/license information

2011-09-01 20:50:19 -04:00

messages.py

Whitespace and formatting cleanup.

2011-10-01 15:10:02 -07:00

mg_globals.py

Merge branch 'i507_beaker_cache'

2011-09-05 23:28:41 -05:00

processing.py

Dot-Notation for MediaEntry.state

2012-01-04 11:57:39 +01:00

routing.py

Added *very preliminary* support for webfinger

2011-12-15 00:46:10 +01:00

staticdirect.py

Warn about unknown staticdirect paths.

2012-01-09 14:39:54 +01:00

views.py

Bug 681 - Comments from reviewing the new video merge

2011-12-06 23:05:47 +01:00

workbench.py

Merge branch 'video_gstreamer-only'

2011-11-21 21:51:30 +01:00