Christopher Allan Webber 04b0b7a124 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

2011-12-04 23:14:08 -06:00

..

auth

Fix redirect to logical path

2011-11-20 20:15:21 +01:00

db

Merge remote-tracking branch 'remotes/jwandborg/master'

2011-11-24 15:24:58 -06:00

edit

Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore.

2011-11-27 14:31:20 +01:00

gmg_commands

Most users won't see this but having space after prompt still nice for passwords.

2011-12-03 21:59:52 -06:00

i18n

Compiled the .mo files too

2011-12-04 13:57:35 -06:00

init

Fixes after merging video branch into master

2011-11-21 23:18:40 +01:00

listings

Rename MediaEntry.uploader() to .get_uploader()

2011-11-22 22:29:37 +01:00

meddleware

Bug #685: only provide CSRF token if it exists

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

media_types

Raise a slightly useful exception when we can't find the media type.

2011-12-03 21:38:45 -06:00

static

Fix button word-wrapping issue

2011-12-04 14:39:42 -06:00

storage

Merge branch 'video_gstreamer-only'

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

submit

Merge remote branch 'remotes/manolinux/683_text_separate_tags_by_commas_and_spaces'

2011-11-27 23:23:20 +01:00

templates/mediagoblin

Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

2011-12-04 23:14:08 -06:00

tests

Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

2011-12-04 23:14:08 -06:00

tools

Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'

2011-12-03 22:11:54 +01:00

user_pages

Changed comment error message wording slightly. Btw, should we translate these things?

2011-12-03 01:19:15 +01:00

__init__.py

508. Updates copyright/license information

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

_version.py

0.1.0!

2011-11-02 09:08:45 -05:00

app.py

We should use the variable local_templates instead of user_template_path

2011-12-02 16:13:14 -06:00

buildout_recipes.py

508. Updates copyright/license information

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

config_spec.ini

Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'

2011-12-03 22:11:54 +01:00

decorators.py

Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

2011-12-04 23:14:08 -06: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

Fixes for video branch

2011-11-22 21:06:08 +01:00

routing.py

508. Updates copyright/license information

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

staticdirect.py

has_key is deprecated, converting uses to use "in" operator.

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

views.py

Merge branch 'video_gstreamer-only'

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

workbench.py

Merge branch 'video_gstreamer-only'

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