Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'

Conflicts:
	mediagoblin/auth/views.py
	mediagoblin/edit/forms.py
	mediagoblin/templates/mediagoblin/edit/edit_account.html

1 files changed, 0 insertions, 25 deletions

diff --git a/mediagoblin/static/js/autofilledin_password.js b/mediagoblin/static/js/autofilledin_password.js
deleted file mode 100644
index 45e867fe..00000000
--- a/mediagoblin/static/js/autofilledin_password.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * GNU MediaGoblin -- federated, autonomous media hosting
- * Copyright (C) 2012 MediaGoblin contributors.  See AUTHORS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-$(document).ready(function(){
-  $('#forgot_password').click(function(event){
-    event.preventDefault();
-    window.location.pathname = $(this).attr('href') + '?username=' +
-                               $('#username').val();
-  });
-});