Christopher Allan Webber b43b17fc26 Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux' ...

Conflicts:
	mediagoblin/util.py

2011-10-01 21:27:36 -05:00

..

auth

Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux

2011-10-01 18:09:49 -04:00

db

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

edit

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

gmg_commands

Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

2011-10-01 21:27:36 -05:00

i18n

Updating translations

2011-09-25 20:31:00 -05:00

init

Merge branch 'i507_beaker_cache'

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

listings

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

middleware

#361: Removing additional secret key, per CW's request.

2011-10-01 14:24:49 -07:00

process_media

Moved common, translation, template, and url code out of util.py and into tools/[file].py

2011-10-01 09:31:42 -04:00

static

Using Local Fonts instead of Remote Fonts linked to Google.

2011-09-10 17:27:47 -05:00

storage

Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

2011-10-01 21:27:36 -05:00

submit

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

templates/mediagoblin

Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware

2011-10-01 12:08:58 -07:00

tests

Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

2011-10-01 21:27:36 -05:00

tools

Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

2011-10-01 21:27:36 -05:00

user_pages

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

__init__.py

508. Updates copyright/license information

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

_version.py

508. Updates copyright/license information

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

app.py

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

buildout_recipes.py

508. Updates copyright/license information

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

config_spec.ini

#361: Removing additional secret key, per CW's request.

2011-10-01 14:24:49 -07:00

decorators.py

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

errormiddleware.py

508. Updates copyright/license information

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

messages.py

508. Updates copyright/license information

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

mg_globals.py

Merge branch 'i507_beaker_cache'

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

routing.py

508. Updates copyright/license information

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

staticdirect.py

508. Updates copyright/license information

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

views.py

Finished splitting util.py into separate files.

2011-10-01 18:05:44 -04:00

workbench.py

508. Updates copyright/license information

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