Merge /home/sam/gene into flask

Conflicts:
	wqflask/wqflask/templates/index_page.html

Merging the code on Sam's branch onto my own

1 files changed, 25 insertions, 0 deletions

diff --git a/wqflask/flask_security/__init__.py b/wqflask/flask_security/__init__.py
new file mode 100644
index 00000000..297033c9
--- /dev/null
+++ b/wqflask/flask_security/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+"""
+    flask.ext.security
+    ~~~~~~~~~~~~~~~~~~
+
+    Flask-Security is a Flask extension that aims to add quick and simple
+    security via Flask-Login, Flask-Principal, Flask-WTF, and passlib.
+
+    :copyright: (c) 2012 by Matt Wright.
+    :license: MIT, see LICENSE for more details.
+"""
+
+__version__ = '1.6.0'
+
+print "using internal flask security"
+
+from .core import Security, RoleMixin, UserMixin, AnonymousUser, current_user
+from .datastore import SQLAlchemyUserDatastore, MongoEngineUserDatastore, PeeweeUserDatastore
+from .decorators import auth_token_required, http_auth_required, \
+     login_required, roles_accepted, roles_required
+from .forms import ForgotPasswordForm, LoginForm, RegisterForm, \
+     ResetPasswordForm, PasswordlessLoginForm, ConfirmRegisterForm
+from .signals import confirm_instructions_sent, password_reset, \
+     reset_password_instructions_sent, user_confirmed, user_registered
+from .utils import login_user, logout_user, url_for_security