vcs.fsf.org Git - mediagoblin.git/commit

author	Christopher Allan Webber <cwebber@dustycloud.org>
	Tue, 16 Sep 2014 19:01:43 +0000 (14:01 -0500)
committer	Christopher Allan Webber <cwebber@dustycloud.org>
	Tue, 16 Sep 2014 19:01:43 +0000 (14:01 -0500)
commit	f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d
tree	0ca05e7a95cfb30d8b286f3ec72e8c95e212511b	tree \| snapshot (zip tar.gz)
parent	5b64c92e0816e733c2f88b88ddc0aec070cdc0d3	commit \| diff
parent	1b4e199668ada5c2ec47df7432ab69e315dc0601	commit \| diff

Merge branch 'master' into merge-python3-port

Has some issues, will iteratively fix!

Conflicts:
mediagoblin/gmg_commands/__init__.py
mediagoblin/gmg_commands/deletemedia.py
mediagoblin/gmg_commands/users.py
mediagoblin/oauth/views.py
mediagoblin/plugins/api/views.py
mediagoblin/tests/test_api.py
mediagoblin/tests/test_edit.py
mediagoblin/tests/test_oauth1.py
mediagoblin/tests/test_util.py
mediagoblin/tools/mail.py
mediagoblin/webfinger/views.py
setup.py

29 files changed:

lazystarter.sh	diff1 \|	diff2 \|	blob \| history
mediagoblin/app.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/auth/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/db/migrations.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/db/models.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/decorators.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/deletemedia.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/users.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/init/celery/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/blog/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/moderation/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/oauth/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/plugins/api/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/plugins/oauth/forms.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/submit/lib.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_api.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_edit.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_ldap.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_modelmethods.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_oauth1.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_util.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/crypto.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/mail.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/response.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/translate.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

lazystarter.sh	diff1 \|	diff2 \|	blob \| history
mediagoblin/app.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/auth/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/db/migrations.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/db/models.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/decorators.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/deletemedia.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/gmg_commands/users.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/init/celery/__init__.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/media_types/blog/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/moderation/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/oauth/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/plugins/api/views.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/plugins/oauth/forms.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/submit/lib.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_api.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_edit.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_ldap.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_modelmethods.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_oauth1.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/test_util.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tests/tools.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/crypto.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/mail.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/response.py	diff1 \|	diff2 \|	blob \| history
mediagoblin/tools/translate.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history