Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge remote-tracking branch 'upstream/master' into basic_auth | Rodney Ewing | 2013-05-30 | 4 | -17/+26 | |
|\| | | | ||||||
| * | | | Commenting out the max-height restriction on thumbnails. | Christopher Allan Webber | 2013-05-30 | 1 | -3/+6 | |
| | | | | ||||||
| * | | | The pdf.js iframe view is awesome so I'm making it the default. So there! ;) | Christopher Allan Webber | 2013-05-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This commit sponsored by Jay Turley. Thank you! | |||||
| * | | | Fixing bug where non-image types might break if ↵ | Christopher Allan Webber | 2013-05-28 | 2 | -13/+19 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | app_config['original_date_visible'] is true Not all media managers have the .get_original_date attribute, so of course break. This is fixed by making a new space where individual media types can define this if they like. This commit sponsored by Matthieu Dupont de Dinechin. Thank you! | |||||
* | | | removed extra argument from check_login_simple in login view | Rodney Ewing | 2013-05-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | cleanup | Rodney Ewing | 2013-05-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/master' into basic_auth | Rodney Ewing | 2013-05-28 | 2 | -42/+30 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/plugins/basic_auth/tools.py | |||||
| * | | added a register_user function | Rodney Ewing | 2013-05-28 | 2 | -33/+53 | |
| | | | | | | | | | | | | | | | cherry picked from rodney757 and fixed for out of order picking. | |||||
| * | | created a check_login_simple function | Rodney Ewing | 2013-05-28 | 5 | -33/+34 | |
| | | | | | | | | | | | | | | | | | | cherry-picked from rodney757, fixed few conflicts due to out of order cherry-picking. Thanks to rodney757 for making my idea even better. | |||||
| * | | moved email_debug_message to gmg/tools/mail | Rodney Ewing | 2013-05-27 | 2 | -13/+15 | |
| | | | ||||||
| * | | moved send_verification_email to auth/tools | Rodney Ewing | 2013-05-27 | 3 | -39/+41 | |
| | | | ||||||
| * | | removed unused import | Rodney Ewing | 2013-05-27 | 1 | -1/+0 | |
| | | | ||||||
| * | | Committing extracted and compiled translations | Christopher Allan Webber | 2013-05-27 | 57 | -5127/+7482 | |
| | | | ||||||
* | | | cleanup | Rodney Ewing | 2013-05-28 | 1 | -8/+0 | |
| | | | ||||||
* | | | Conflicts: | Rodney Ewing | 2013-05-27 | 59 | -5127/+7502 | |
| | | | | | | | | | | | | | | | | | | mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/plugins/basic_auth/tools.py | |||||
* | | | modified get_user function to take kwargs instead of username | Rodney Ewing | 2013-05-27 | 3 | -11/+14 | |
| | | | ||||||
* | | | no need for user might be email kwarg in check_login_simple | Rodney Ewing | 2013-05-27 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'pre-auth' into basic_auth | Rodney Ewing | 2013-05-27 | 3 | -40/+61 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/plugins/basic_auth/tools.py | |||||
| * | | | moved fp_verification_email to auth/tools | Rodney Ewing | 2013-05-27 | 2 | -34/+30 | |
| | | | | ||||||
| * | | | created a check_login_simple function | Rodney Ewing | 2013-05-27 | 5 | -33/+32 | |
| | | | | ||||||
| * | | | added a register_user function | Rodney Ewing | 2013-05-27 | 2 | -33/+55 | |
| | | | | ||||||
| * | | | moved email_debug_message to gmg/tools/mail | Rodney Ewing | 2013-05-27 | 2 | -13/+15 | |
| | | | | ||||||
| * | | | moved send_verification_email to auth/tools | Rodney Ewing | 2013-05-27 | 3 | -39/+41 | |
| | | | | ||||||
| * | | | removed unused import | Rodney Ewing | 2013-05-27 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | changed User model pw_hash field to nullable and added migrations | Rodney Ewing | 2013-05-27 | 2 | -1/+12 | |
| |/ / | ||||||
| * / | Extract footer into bits/base_footer.html. | Elrond | 2013-05-26 | 2 | -10/+29 | |
| |/ | ||||||
* | | no need for check_login with the new check_login_simple function | Rodney Ewing | 2013-05-27 | 4 | -22/+6 | |
| | | ||||||
* | | renamed lib to tools | Rodney Ewing | 2013-05-27 | 4 | -17/+16 | |
| | | ||||||
* | | cleanup after merge | Rodney Ewing | 2013-05-27 | 4 | -20/+14 | |
| | | ||||||
* | | Merge branch 'pre-auth' into basic_auth | Rodney Ewing | 2013-05-27 | 6 | -73/+90 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/db/migrations.py mediagoblin/plugins/basic_auth/lib.py mediagoblin/plugins/httpapiauth/__init__.py mediagoblin/plugins/piwigo/views.py | |||||
| * | | created a check_login_simple function | Rodney Ewing | 2013-05-25 | 5 | -33/+32 | |
| | | | ||||||
| * | | added a register_user function | Rodney Ewing | 2013-05-24 | 2 | -33/+55 | |
| | | | ||||||
| * | | moved email_debug_message to gmg/tools/mail | Rodney Ewing | 2013-05-24 | 2 | -13/+15 | |
| | | | ||||||
| * | | moved send_verification_email to auth/tools | Rodney Ewing | 2013-05-24 | 3 | -39/+41 | |
| | | | ||||||
| * | | removed unused import | Rodney Ewing | 2013-05-24 | 1 | -1/+0 | |
| | | | ||||||
| * | | changed User model pw_hash field to nullable and added migrations | Rodney Ewing | 2013-05-24 | 2 | -1/+12 | |
| |/ | ||||||
* | | moving forgot_password views back to gmg/auth and cleanup | Rodney Ewing | 2013-05-24 | 15 | -477/+144 | |
| | | ||||||
* | | fixed failing tests after rebase | Rodney Ewing | 2013-05-24 | 5 | -19/+18 | |
| | | ||||||
* | | added gen_password_hash and check_password functions to auth/__init__ | Rodney Ewing | 2013-05-24 | 3 | -3/+13 | |
| | | ||||||
* | | added focus to form input | Rodney Ewing | 2013-05-24 | 5 | -4/+13 | |
| | | | | | | | | | | | | Conflicts: mediagoblin/auth/views.py mediagoblin/plugins/openid/views.py | |||||
* | | modified basic_auth.check_login to check that the user has a pw_hash first | Rodney Ewing | 2013-05-24 | 1 | -3/+4 | |
| | | ||||||
* | | changed occurances of form.data['whatever'] to form.whatever.data | Rodney Ewing | 2013-05-24 | 2 | -11/+12 | |
| | | | | | | | | | | | | Conflicts: mediagoblin/plugins/basic_auth/__init__.py mediagoblin/plugins/openid/__init__.py | |||||
* | | check if password field present in basic_auth create_user | Rodney Ewing | 2013-05-24 | 1 | -1/+1 | |
| | | ||||||
* | | added a register_user function to be able to use in a plugin's register ↵ | Rodney Ewing | 2013-05-24 | 2 | -28/+47 | |
| | | | | | | | | view, and modified auth/views.register to redirect to openid/register if appropriate. | |||||
* | | Modified basic_auth plugin to work with modified auth plugin hooks. Added ↵ | Rodney Ewing | 2013-05-24 | 2 | -32/+27 | |
| | | | | | | | | context variables. Removed basic_auth/tools which was previously renamed to basic_auth/lib. | |||||
* | | modified auth/__init__ hooks to work better with multiple plugins. Removed ↵ | Rodney Ewing | 2013-05-24 | 3 | -96/+74 | |
| | | | | | | | | auth/lib.py. And added a basic_extra_verification function that all plugins will use. | |||||
* | | removed check_login from db mixin | Rodney Ewing | 2013-05-24 | 3 | -9/+4 | |
| | | ||||||
* | | added Copyright header to basic_auth/forms.py | Rodney Ewing | 2013-05-24 | 1 | -0/+15 | |
| | | ||||||
* | | moved fake_login_attempt to plugins | Rodney Ewing | 2013-05-24 | 6 | -27/+166 | |
| | | ||||||
* | | log a previously logged in user when switched to no_auth mode | Rodney Ewing | 2013-05-24 | 2 | -1/+10 | |
| | |