diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2018-10-27 00:34:45 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2018-10-27 00:34:45 +0200 |
| commit | aedd03eb00c5584e180202bf4beadfc3888dbfb8 (patch) | |
| tree | b0bb69c1be2f2e3adfe4a9f702bd3c1ea66ef900 /src/web/views | |
| parent | Filter feeds per category on the user profile page. (diff) | |
| parent | Updated NPM engine. (diff) | |
| download | newspipe-aedd03eb00c5584e180202bf4beadfc3888dbfb8.tar.gz newspipe-aedd03eb00c5584e180202bf4beadfc3888dbfb8.tar.bz2 newspipe-aedd03eb00c5584e180202bf4beadfc3888dbfb8.zip | |
Merge branch 'master' of gitlab.com:newspipe/newspipe
Diffstat (limited to 'src/web/views')
| -rw-r--r-- | src/web/views/admin.py | 2 | ||||
| -rw-r--r-- | src/web/views/api/v3/article.py | 2 | ||||
| -rw-r--r-- | src/web/views/api/v3/common.py | 2 | ||||
| -rw-r--r-- | src/web/views/api/v3/feed.py | 2 | ||||
| -rw-r--r-- | src/web/views/bookmark.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/web/views/admin.py b/src/web/views/admin.py index 07c4f974..2e97ff36 100644 --- a/src/web/views/admin.py +++ b/src/web/views/admin.py @@ -61,7 +61,7 @@ def process_user_form(user_id=None): # Edit a user user_contr.update({'id': user_id}, {'nickname': form.nickname.data, - 'password': form.password.data, + 'pwdhash': generate_password_hash(form.password.data), 'automatic_crawling': form.automatic_crawling.data}) user = user_contr.get(id=user_id) flash(gettext('User %(nick)s successfully updated', diff --git a/src/web/views/api/v3/article.py b/src/web/views/api/v3/article.py index e2f10979..4cf35648 100644 --- a/src/web/views/api/v3/article.py +++ b/src/web/views/api/v3/article.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/api/v3/common.py b/src/web/views/api/v3/common.py index f6899b75..d5e94a3f 100644 --- a/src/web/views/api/v3/common.py +++ b/src/web/views/api/v3/common.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/api/v3/feed.py b/src/web/views/api/v3/feed.py index 64a03e84..2cbbafd9 100644 --- a/src/web/views/api/v3/feed.py +++ b/src/web/views/api/v3/feed.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2018 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/Newspipe/Newspipe +# For more information : http://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/web/views/bookmark.py b/src/web/views/bookmark.py index 966ca4b2..21d832d2 100644 --- a/src/web/views/bookmark.py +++ b/src/web/views/bookmark.py @@ -4,7 +4,7 @@ # Newspipe - A Web based news aggregator. # Copyright (C) 2010-2017 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/newspipe/newspipe +# For more information : https://gitlab.com/newspipe/newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as |