aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'spaetz/master'Christopher Allan Webber2013-09-282-109/+147
|\
| * Simplify non-active user pageSebastian Spaeth2013-09-032-109/+147
| | | | | | | | | | | | | | | | | | | | | | Currently, the logic of whether a user account has been activated is in the main user.html template. This is not good as: doing that check for all users from template code is probably not great for performance, but more severly, the template logic is rather difficult and convoluted. Split this in a user.html and a user_nonactive.html where user.html is used for active users and user_nonactive displays all the "you still need to be activated" blurbs. This makes the templates much easier on the eyes.
* | Fixing error caused by merge (failure to build password editing url)Christopher Allan Webber2013-09-191-1/+1
| | | | | | | | This commit sponsored by Kim Lindberger. Thank you!
* | Merge remote-tracking branch 'refs/remotes/rodney757/auth_refactor'Christopher Allan Webber2013-09-196-178/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/views.py mediagoblin/edit/forms.py mediagoblin/templates/mediagoblin/edit/edit_account.html
| * | moved create account link on login page to a hookRodney Ewing2013-08-161-7/+1
| | |
| * | used template hooks instead of hardcoding basic_auth functionality into ↵Rodney Ewing2013-08-162-15/+3
| | | | | | | | | | | | templates
| * | moved change_pass to basic_auth and fixed some typos with the moving of ↵Rodney Ewing2013-08-161-52/+0
| | | | | | | | | | | | forgot pass
| * | moved forgot pass to basic_auth pluginRodney Ewing2013-08-163-111/+0
| | |
* | | Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'Christopher Allan Webber2013-09-181-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| * | | javascript limit validationRodney Ewing2013-08-261-0/+5
| | | |
* | | | Also add a bit of color to the theme's base colorChristopher Allan Webber2013-09-151-1/+7
| | | | | | | | | | | | | | | | This commit sponsored by Marc Lijour. Thanks!
* | | | Updating the video.js that we use to avoid an XSS attack. Yikes! ;\Christopher Allan Webber2013-09-151-3/+20
| |_|/ |/| | | | | | | | This commit sponsored by Daniel Valentine. Thank you!
* | | pdf media_type now have their own config_spec.iniRodney Ewing2013-08-291-1/+1
| | |
* | | video media_type now have their own config_spec.iniRodney Ewing2013-08-291-1/+1
| | |
* | | Fixing another typo, thanks to Laura Arjona (again!)Christopher Allan Webber2013-08-261-1/+1
| | |
* | | Merge remote-tracking branch 'refs/remotes/rodney757/email'Christopher Allan Webber2013-08-252-8/+56
|\ \ \
| * | | move links to the bottom of the page until we have a tabbed UIRodney Ewing2013-08-201-13/+11
| | | |
| * | | maybe have change password and email on same pageRodney Ewing2013-08-202-0/+50
| | | |
* | | | Merge remote-tracking branch 'refs/remotes/rodney757/notifications'Christopher Allan Webber2013-08-212-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | use urlgen and store it in a variableRodney Ewing2013-08-201-0/+3
| | | |
| * | | add the ability to mark all notifications read.Rodney Ewing2013-08-201-0/+4
| |/ /
* | | Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'Christopher Allan Webber2013-08-211-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: mediagoblin/processing/task.py mediagoblin/submit/lib.py
| * | rename webm_640 to webm_video since it might be a different resolutionRodney Ewing2013-08-201-3/+3
| | |
* | | use href='javascript:;' instead of href='#notifications', etcRodney Ewing2013-08-201-3/+3
|/ /
* / load js at the end of the pageRodney Ewing2013-08-162-2/+2
|/
* Merge branch 'persona_resquash'Christopher Allan Webber2013-08-152-6/+35
|\
| * made it so that the create account button works with only persona enabledRodney Ewing2013-07-031-1/+1
| |
| * moved persona template stuff to use template_hooksRodney Ewing2013-07-034-27/+2
| |
| * merge --squash persona branch to take care of a false merge commit inRodney Ewing2013-07-035-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the basic_auth branch that persona is forked from Conflicts: mediagoblin/templates/mediagoblin/auth/login.html mediagoblin/templates/mediagoblin/auth/register.html mediagoblin/templates/mediagoblin/edit/edit_account.html These are commit messages from the squashed persona stuff: - added tests and fixed minor errors - fixed a redirect loop when only persona is enabled and accessing /auth/login - moved persona.js to plugin's static dir - fixes for add/remove persona emails - add and remove personas - working with multiple plugins - working version - switched to hidden form instead of ajax - beginings
* | Merge remote-tracking branch 'refs/remotes/tsyesika/master'Christopher Allan Webber2013-08-152-0/+89
|\ \ | | | | | | | | | New oauth tools! Heck yeah!
| * \ Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinxray72242013-07-144-32/+42
| |\ \
| * | | Adds more support for oauth - access_token & decorators still to doxray72242013-07-112-0/+89
| | |/ | |/|
* | | Avoiding the celery warnings that we seem to be confusing people lately.Christopher Allan Webber2013-08-143-6/+5
| | | | | | | | | | | | | | | | | | Basically, it's shuffling around the notifications stuff. This commit sponsored by Günter Kraft. Thank you!
* | | change dropdown button to <a> from <div> so that it is tabbableRodney Ewing2013-08-091-2/+2
| | |
* | | Switching the MediaGoblin homepage image over to using the "official" ↵Christopher Allan Webber2013-08-081-2/+2
| | | | | | | | | | | | gavroche style
* | | Add ?next= when trying to add a comment when not logged inRodney Ewing2013-08-081-1/+2
| | |
* | | Changed how the comment was encoded/read.Emily O'Leary2013-08-071-0/+1
| | | | | | | | | | | | | | | Fixed CSRF + Post with comment preview. Merged with latest master
* | | Added comment preview functionality to user pages. It works by passing the ↵Emily O'Leary2013-08-071-0/+2
| |/ |/| | | | | | | | | comment's value as a JSON string to a new handler that lives at /ajax/comment/preview. The query string is decoded, unquoted, and has its leading and trailing quotes removed to match the input that cleaned_markdown_conversion expects. It does this in real time with a 500ms lag by using a timer. Initially I tried the onChange handler but you need to lose focus for that to process. The javascript timer is only invoked if the add comment button is pressed. A request is only sent if the comment box is not empty and the current value is not the same as the last value.
* | Patch by Strum. Remove redundent tool-tips from Stl media_typeRodney Ewing2013-07-121-11/+5
| |
* | make change_pass page autofocusRodney Ewing2013-07-111-1/+1
| |
* | forgot to render errorsRodney Ewing2013-07-111-5/+10
| |
* | change to class instead of id to work with firefoxRodney Ewing2013-07-111-1/+1
| |
* | fix for boolean fieldsRodney Ewing2013-07-111-18/+29
| |
* | should use media.slug_or_id incase a MediaEntry doesn't have a slugRodney Ewing2013-07-111-2/+2
|/
* Fix missing quoteChristopher Allan Webber2013-07-031-1/+1
|
* changed hook name to reuse with personaRodney Ewing2013-07-033-3/+3
|
* use template hooks instead of hardcoding in templatesRodney Ewing2013-07-033-27/+3
|
* merge --squash openid branch to take care of a false merge commit in theRodney Ewing2013-07-033-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | basic_auth branch that openid is forked from Commits squashed together (in reverse chronological order): - do the label thing only for boolean fields - made edit_account to autofocus on the first field - added feature to render_divs where if field.label == '' then it will render form.description the same a render_label - added allow_registration check - refactored create_user - removed verification_key from create_user - removed get_user from openid - cleanup after removing openid from template_env.globals - fix for werkzueg 0.9.1 - cleanup after merge - more tests - restored openid extra_validation just for safety - tests for openid - deleted openid extra_validation - passed next parameter in session for openid - fixed a bug that was deleting the messages - implemented openid store using sqlalchemy - ask openid provider for 'nickname' to prefill username in registration form - refactored delete openid url to work with generic urls such as google and to not allow a user to delete a url if it is there only one and they don't have a pw - refactored login to register user workflow, which fixed a problem where the 'or register with a password link' wasn't showing up when the finish_login view called the register view because there wasn't any redirect. - added the ability to remove openid's - added the ability to add openids to an existing account - refactored start_login and finish_login views - modified edit_account.html to use render_divs - modified gmg/edit/views to behave appropriatly if no password authentication is enabled. moved the update email stuff to it's own funtion to make edit_account view cleaner. edit_account now modifies the form depending on the plugins. - minor typos - added retrieving email from openid provider - moved allow_registration check to a decorator - moved check if auth is enabled to a decorator - changed openid user registration to go through login first - cleanup after merge - modified verification emails to use itsdangerous tokens - added error handling on bad token, fixed route, and added tests - added support for user to change email address - added link to login view openid/password in login template - updated openid get_user function - modified get_user function to take kwargs instead of username - no need for user might be email kwarg in check_login_simple - added gen_password_hash and check_password functions to auth/__init__ - added focus to form input - made imports fully qualified - modified basic_auth.check_login to check that the user has a pw_hash first - changed occurances of form.data['whatever'] to form.whatever.data - convert tabs to spaces in register template, remove unsed templates, and fixed trans tags in templates - in process of openid login. it works, but needs major imporvements - make password field required in basic_auth form - check if password field present in basic_auth create_user - modified openid create_user function - modified models based on Elronds suggestions - changed register form action to a variable to be passed in by the view using the template - openid plugin v0, still need to authenticate via openid. - added a register_user function to be able to use in a plugin's register 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 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 auth/lib.py. And added a basic_extra_verification function that all plugins will use. - added models and migrations for openid plugin
* typoRodney Ewing2013-06-261-1/+1
|
* do the label thing only for boolean fieldsRodney Ewing2013-06-261-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-07 16:44:31 +0000