diff options
| author | Lei Yan | 2014-07-14 16:23:12 +0000 |
|---|---|---|
| committer | Lei Yan | 2014-07-14 17:02:01 +0000 |
| commit | 214bf0128b8ecdda718983c5563cf34160743758 (patch) | |
| tree | 917e7a5ae78dc4ff65dc08d107a0e3ae3a47c67c /wqflask/flask_security | |
| parent | 8de6fec18cd98a10c58702c448a1e01e147dc5f7 (diff) | |
| parent | fbdbf4b7410185e2a978ecc8e120ae56ff6da0ce (diff) | |
| download | genenetwork2-214bf0128b8ecdda718983c5563cf34160743758.tar.gz | |
Merge /home/zas1024/gene
Conflicts:
wqflask/wqflask/static/new/javascript/dataset_select_menu.js
wqflask/wqflask/templates/corr_scatter_plot_old.html
Diffstat (limited to 'wqflask/flask_security')
38 files changed, 0 insertions, 0 deletions
diff --git a/wqflask/flask_security/__init__.py b/wqflask/flask_security/__init__.py index 81e6c89e..81e6c89e 100644..100755 --- a/wqflask/flask_security/__init__.py +++ b/wqflask/flask_security/__init__.py diff --git a/wqflask/flask_security/changeable.py b/wqflask/flask_security/changeable.py index 4447b655..4447b655 100644..100755 --- a/wqflask/flask_security/changeable.py +++ b/wqflask/flask_security/changeable.py diff --git a/wqflask/flask_security/confirmable.py b/wqflask/flask_security/confirmable.py index a7caf6cd..a7caf6cd 100644..100755 --- a/wqflask/flask_security/confirmable.py +++ b/wqflask/flask_security/confirmable.py diff --git a/wqflask/flask_security/core.py b/wqflask/flask_security/core.py index 0f3a231f..0f3a231f 100644..100755 --- a/wqflask/flask_security/core.py +++ b/wqflask/flask_security/core.py diff --git a/wqflask/flask_security/datastore.py b/wqflask/flask_security/datastore.py index 634399d9..634399d9 100644..100755 --- a/wqflask/flask_security/datastore.py +++ b/wqflask/flask_security/datastore.py diff --git a/wqflask/flask_security/decorators.py b/wqflask/flask_security/decorators.py index 0ea1105c..0ea1105c 100644..100755 --- a/wqflask/flask_security/decorators.py +++ b/wqflask/flask_security/decorators.py diff --git a/wqflask/flask_security/forms.py b/wqflask/flask_security/forms.py index 54677e77..54677e77 100644..100755 --- a/wqflask/flask_security/forms.py +++ b/wqflask/flask_security/forms.py diff --git a/wqflask/flask_security/passwordless.py b/wqflask/flask_security/passwordless.py index b0accb2c..b0accb2c 100644..100755 --- a/wqflask/flask_security/passwordless.py +++ b/wqflask/flask_security/passwordless.py diff --git a/wqflask/flask_security/recoverable.py b/wqflask/flask_security/recoverable.py index 6aafc111..6aafc111 100644..100755 --- a/wqflask/flask_security/recoverable.py +++ b/wqflask/flask_security/recoverable.py diff --git a/wqflask/flask_security/registerable.py b/wqflask/flask_security/registerable.py index 4606c7c6..4606c7c6 100644..100755 --- a/wqflask/flask_security/registerable.py +++ b/wqflask/flask_security/registerable.py diff --git a/wqflask/flask_security/script.py b/wqflask/flask_security/script.py index 9c9a2469..9c9a2469 100644..100755 --- a/wqflask/flask_security/script.py +++ b/wqflask/flask_security/script.py diff --git a/wqflask/flask_security/signals.py b/wqflask/flask_security/signals.py index e1c29548..e1c29548 100644..100755 --- a/wqflask/flask_security/signals.py +++ b/wqflask/flask_security/signals.py diff --git a/wqflask/flask_security/templates/.DS_Store b/wqflask/flask_security/templates/.DS_Store Binary files differindex b72f1d98..b72f1d98 100644..100755 --- a/wqflask/flask_security/templates/.DS_Store +++ b/wqflask/flask_security/templates/.DS_Store diff --git a/wqflask/flask_security/templates/security/.DS_Store b/wqflask/flask_security/templates/security/.DS_Store Binary files differindex 5008ddfc..5008ddfc 100644..100755 --- a/wqflask/flask_security/templates/security/.DS_Store +++ b/wqflask/flask_security/templates/security/.DS_Store diff --git a/wqflask/flask_security/templates/security/_macros.html b/wqflask/flask_security/templates/security/_macros.html index 8575f3db..8575f3db 100644..100755 --- a/wqflask/flask_security/templates/security/_macros.html +++ b/wqflask/flask_security/templates/security/_macros.html diff --git a/wqflask/flask_security/templates/security/_menu.html b/wqflask/flask_security/templates/security/_menu.html index 5291f809..5291f809 100644..100755 --- a/wqflask/flask_security/templates/security/_menu.html +++ b/wqflask/flask_security/templates/security/_menu.html diff --git a/wqflask/flask_security/templates/security/_messages.html b/wqflask/flask_security/templates/security/_messages.html index 179d0636..179d0636 100644..100755 --- a/wqflask/flask_security/templates/security/_messages.html +++ b/wqflask/flask_security/templates/security/_messages.html diff --git a/wqflask/flask_security/templates/security/change_password.html b/wqflask/flask_security/templates/security/change_password.html index 8ee3eb73..8ee3eb73 100644..100755 --- a/wqflask/flask_security/templates/security/change_password.html +++ b/wqflask/flask_security/templates/security/change_password.html diff --git a/wqflask/flask_security/templates/security/email/change_notice.html b/wqflask/flask_security/templates/security/email/change_notice.html index d1224cf5..d1224cf5 100644..100755 --- a/wqflask/flask_security/templates/security/email/change_notice.html +++ b/wqflask/flask_security/templates/security/email/change_notice.html diff --git a/wqflask/flask_security/templates/security/email/change_notice.txt b/wqflask/flask_security/templates/security/email/change_notice.txt index e74bd80d..e74bd80d 100644..100755 --- a/wqflask/flask_security/templates/security/email/change_notice.txt +++ b/wqflask/flask_security/templates/security/email/change_notice.txt diff --git a/wqflask/flask_security/templates/security/email/confirmation_instructions.html b/wqflask/flask_security/templates/security/email/confirmation_instructions.html index 5082a9a8..5082a9a8 100644..100755 --- a/wqflask/flask_security/templates/security/email/confirmation_instructions.html +++ b/wqflask/flask_security/templates/security/email/confirmation_instructions.html diff --git a/wqflask/flask_security/templates/security/email/confirmation_instructions.txt b/wqflask/flask_security/templates/security/email/confirmation_instructions.txt index fb435b55..fb435b55 100644..100755 --- a/wqflask/flask_security/templates/security/email/confirmation_instructions.txt +++ b/wqflask/flask_security/templates/security/email/confirmation_instructions.txt diff --git a/wqflask/flask_security/templates/security/email/login_instructions.html b/wqflask/flask_security/templates/security/email/login_instructions.html index 45a7cb57..45a7cb57 100644..100755 --- a/wqflask/flask_security/templates/security/email/login_instructions.html +++ b/wqflask/flask_security/templates/security/email/login_instructions.html diff --git a/wqflask/flask_security/templates/security/email/login_instructions.txt b/wqflask/flask_security/templates/security/email/login_instructions.txt index 1364ed65..1364ed65 100644..100755 --- a/wqflask/flask_security/templates/security/email/login_instructions.txt +++ b/wqflask/flask_security/templates/security/email/login_instructions.txt diff --git a/wqflask/flask_security/templates/security/email/reset_instructions.html b/wqflask/flask_security/templates/security/email/reset_instructions.html index fd0b48d8..fd0b48d8 100644..100755 --- a/wqflask/flask_security/templates/security/email/reset_instructions.html +++ b/wqflask/flask_security/templates/security/email/reset_instructions.html diff --git a/wqflask/flask_security/templates/security/email/reset_instructions.txt b/wqflask/flask_security/templates/security/email/reset_instructions.txt index 91ac288e..91ac288e 100644..100755 --- a/wqflask/flask_security/templates/security/email/reset_instructions.txt +++ b/wqflask/flask_security/templates/security/email/reset_instructions.txt diff --git a/wqflask/flask_security/templates/security/email/reset_notice.html b/wqflask/flask_security/templates/security/email/reset_notice.html index 536e2961..536e2961 100644..100755 --- a/wqflask/flask_security/templates/security/email/reset_notice.html +++ b/wqflask/flask_security/templates/security/email/reset_notice.html diff --git a/wqflask/flask_security/templates/security/email/reset_notice.txt b/wqflask/flask_security/templates/security/email/reset_notice.txt index a3fa0b4b..a3fa0b4b 100644..100755 --- a/wqflask/flask_security/templates/security/email/reset_notice.txt +++ b/wqflask/flask_security/templates/security/email/reset_notice.txt diff --git a/wqflask/flask_security/templates/security/email/welcome.html b/wqflask/flask_security/templates/security/email/welcome.html index 55eaed61..55eaed61 100644..100755 --- a/wqflask/flask_security/templates/security/email/welcome.html +++ b/wqflask/flask_security/templates/security/email/welcome.html diff --git a/wqflask/flask_security/templates/security/email/welcome.txt b/wqflask/flask_security/templates/security/email/welcome.txt index fb6ee5b5..fb6ee5b5 100644..100755 --- a/wqflask/flask_security/templates/security/email/welcome.txt +++ b/wqflask/flask_security/templates/security/email/welcome.txt diff --git a/wqflask/flask_security/templates/security/forgot_password.html b/wqflask/flask_security/templates/security/forgot_password.html index 90fcaf66..90fcaf66 100644..100755 --- a/wqflask/flask_security/templates/security/forgot_password.html +++ b/wqflask/flask_security/templates/security/forgot_password.html diff --git a/wqflask/flask_security/templates/security/login_user.html b/wqflask/flask_security/templates/security/login_user.html index d781ce08..d781ce08 100644..100755 --- a/wqflask/flask_security/templates/security/login_user.html +++ b/wqflask/flask_security/templates/security/login_user.html diff --git a/wqflask/flask_security/templates/security/register_user.html b/wqflask/flask_security/templates/security/register_user.html index 87cf9b1d..87cf9b1d 100644..100755 --- a/wqflask/flask_security/templates/security/register_user.html +++ b/wqflask/flask_security/templates/security/register_user.html diff --git a/wqflask/flask_security/templates/security/reset_password.html b/wqflask/flask_security/templates/security/reset_password.html index e6fc3f58..e6fc3f58 100644..100755 --- a/wqflask/flask_security/templates/security/reset_password.html +++ b/wqflask/flask_security/templates/security/reset_password.html diff --git a/wqflask/flask_security/templates/security/send_confirmation.html b/wqflask/flask_security/templates/security/send_confirmation.html index 3e828407..3e828407 100644..100755 --- a/wqflask/flask_security/templates/security/send_confirmation.html +++ b/wqflask/flask_security/templates/security/send_confirmation.html diff --git a/wqflask/flask_security/templates/security/send_login.html b/wqflask/flask_security/templates/security/send_login.html index 15611c57..15611c57 100644..100755 --- a/wqflask/flask_security/templates/security/send_login.html +++ b/wqflask/flask_security/templates/security/send_login.html diff --git a/wqflask/flask_security/utils.py b/wqflask/flask_security/utils.py index 7397ab4f..7397ab4f 100644..100755 --- a/wqflask/flask_security/utils.py +++ b/wqflask/flask_security/utils.py diff --git a/wqflask/flask_security/views.py b/wqflask/flask_security/views.py index 1b8488d8..1b8488d8 100644..100755 --- a/wqflask/flask_security/views.py +++ b/wqflask/flask_security/views.py |