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

author	Rodney Ewing <ewing.rj@gmail.com>
	Wed, 26 Jun 2013 19:04:45 +0000 (12:04 -0700)
committer	Christopher Allan Webber <cwebber@dustycloud.org>
	Wed, 3 Jul 2013 20:07:39 +0000 (15:07 -0500)
commit	4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3
tree	2aff43754fa275c2f60a6510f1d810d7b795bbbe	tree \| snapshot (zip tar.gz)
parent	41a14c6efc1dd9cfc36f1b2eb4cb3f3b34e4d975	commit \| diff

merge --squash persona branch to take care of a false merge commit in
the basic_auth branch that persona is forked from

Conflicts:
mediagoblin/templates/mediagoblin/auth/login.html
mediagoblin/templates/mediagoblin/auth/register.html
mediagoblin/templates/mediagoblin/edit/edit_account.html

These are commit messages from the squashed persona stuff:

- added tests and fixed minor errors
- fixed a redirect loop when only persona is enabled and accessing /auth/login
- moved persona.js to plugin's static dir
- fixes for add/remove persona emails
- add and remove personas
- working with multiple plugins
- working version
- switched to hidden form instead of ajax
- beginings

17 files changed:

mediagoblin/auth/views.py		diff \| blob \| blame \| history
mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html		diff \| blob \| blame \| history
mediagoblin/plugins/persona/__init__.py	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/forms.py	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/models.py	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/static/js/persona.js	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona_js_head.html	[new file with mode: 0644]	blob
mediagoblin/plugins/persona/views.py	[new file with mode: 0644]	blob
mediagoblin/templates/mediagoblin/auth/login.html		diff \| blob \| blame \| history
mediagoblin/templates/mediagoblin/auth/register.html		diff \| blob \| blame \| history
mediagoblin/templates/mediagoblin/base.html		diff \| blob \| blame \| history
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html		diff \| blob \| blame \| history
mediagoblin/templates/mediagoblin/edit/edit_account.html		diff \| blob \| blame \| history
mediagoblin/tests/auth_configs/persona_appconfig.ini	[new file with mode: 0644]	blob
mediagoblin/tests/test_persona.py	[new file with mode: 0644]	blob

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

RSS Atom