aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
|
* made edit_account to autofocus on the first fieldRodney Ewing2013-06-261-1/+1
|
* added feature to render_divs where if field.label == '' then it will render ↵Rodney Ewing2013-06-252-7/+6
| | | | form.description the same a render_label
* Merge remote-tracking branch 'upstream/master' into authRodney Ewing2013-06-257-13/+131
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/app.py mediagoblin/auth/forms.py mediagoblin/auth/tools.py mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/edit/views.py mediagoblin/plugins/basic_auth/tools.py mediagoblin/tests/test_edit.py
| * Merge remote-tracking branch 'refs/remotes/joar/notifications'Christopher Allan Webber2013-06-224-0/+86
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| | * New notifications, fixedJoar Wandborg2013-06-093-5/+7
| | | | | | | | | | | | | | | | | | - Remove notification-gem if notifications are null - Move comment-susbscription next to add-comment button - Add copyright header to notifications.js
| | * New notificationsJoar Wandborg2013-06-094-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added request.notifications - Email configuration fixes - Set config_spec default SMTP port to `0` and switch to SSL/non-SSL default if `port == 0` - Added email_smtp_use_ssl configuration setting - Added migrations for notification tables - Added __repr__ to MediaComment(Mixin) - Added MediaComment.get_entry => MediaEntry - Added CommentSubscription, CommentNotification, Notification, ProcessingNotification tables - Added notifications.task to celery init - Fixed a bug in the video transcoder where pygst would hijack the --help argument. - Added notifications - views - silence - subscribe - routes - utility methods - celery task - Added half-hearted .active comment CSS style - Added quick JS to show header_dropdown - Added fragment template to show notifications in header_dropdown - Added fragment template to show subscribe/unsubscribe buttons on media/comment pages - Updated celery setup tests with notifications.task - Tried to fix test_misc tests that I broke - Added notification tests - Added and extended tests.tools fixtures - Integrated new notifications into media_home, media_post_comment views - Bumped SQLAlchemy dependency to >= 0.8.0 since we need polymorphic for the notifications to work
| * | Removing the "enter your password to change your email" bit.Christopher Allan Webber2013-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | | A good idea, though it feels fairly clumsy in the form, and I think if you're logged in you can already sabotage the user pretty well. This commit sponsored by Sergey Matveev. Thanks!
| * | Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'Christopher Allan Webber2013-06-212-0/+31
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into change_emailRodney Ewing2013-05-282-10/+29
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/lib.py
| | * | | added support for user to change email addressRodney Ewing2013-05-242-0/+31
| | | | |
| * | | | Indenting some stuff in pdf.html and wrapping width and height parameters in ↵Christopher Allan Webber2013-06-201-13/+15
| | |_|/ | |/| | | | | | | | | | quotes
* | | | changes after cwebb's reviewRodney Ewing2013-06-215-16/+16
| | | |
* | | | minor changes from aaronw's reviewRodney Ewing2013-06-042-6/+6
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into basic_authRodney Ewing2013-05-302-13/+19
|\| | |
| * | | Fixing bug where non-image types might break if ↵Christopher Allan Webber2013-05-282-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!
* | | Merge branch 'pre-auth' into basic_authRodney Ewing2013-05-272-10/+29
|\| | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/plugins/basic_auth/tools.py
| * | Extract footer into bits/base_footer.html.Elrond2013-05-262-10/+29
| |/
* | moving forgot_password views back to gmg/auth and cleanupRodney Ewing2013-05-242-1/+3
| |
* | added focus to form inputRodney Ewing2013-05-244-3/+8
| | | | | | | | | | | | Conflicts: mediagoblin/auth/views.py mediagoblin/plugins/openid/views.py
* | add a check for authentication plugin on startup and respond according to ↵Rodney Ewing2013-05-243-17/+23
| | | | | | | | no_auth config option. allows instance to be run w/o authentication
* | moved forgot pw views to basic_auth pluginRodney Ewing2013-05-241-1/+1
|/
* Cleaned up EXIF viewJoar Wandborg2013-05-231-48/+4
| | | | | | The last update made the assumption that EXIF metadata is in some way consistent between camera models, images, manufacturers. This update takes into account that nothing is certain whenever EXIF is involved.
* Move "bits" templates with dashes in them to underscoresChristopher Allan Webber2013-05-224-3/+3
| | | | | | Moved all references and also added a note to our release notes. This commit sponsored by Juan Rodriguez. Thank you!
* Moved frontpage "welcome" stuff into its own bits file.Christopher Allan Webber2013-05-222-17/+37
| | | | | | This should make it easier to override just that part of the page. This commit sponsored by David Rylander. Thank you!
* fixed translation, and changed tabs to spaces, and change it so the user can ↵Rodney Ewing2013-05-212-12/+12
| | | | view their password as they're typing.
* moved change pass to a seperate view and fixed issues 709Rodney Ewing2013-05-202-3/+58
|
* Modifies EXIF section with Camera Info, display toggle and template stylingGabriel Saldana2013-05-201-3/+80
|
* Normalizing indentation a bit in media.htmlChristopher Allan Webber2013-05-141-9/+9
| | | | This commit sponsored by Christian Frank. Thank you!
* fix for bug when comments are disabled, link attribute is never closedRodney Ewing2013-05-141-2/+2
|
* Moving the get_original_date method over to the MediaManager.Christopher Allan Webber2013-05-111-1/+1
| | | | | | | This fixes a bug so that it doesn't explode if the media_data doesn't exist. This commit sponsored by Ole-Morten Duesund. Thank you!
* Updated "created on" feature to reflect new "hover for real time" toolingChristopher Allan Webber2013-05-111-6/+10
|
* Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'Christopher Allan Webber2013-05-111-0/+11
|\ | | | | | | | | | | Conflicts: mediagoblin/config_spec.ini mediagoblin/templates/mediagoblin/user_pages/media.html
| * Moved exif date transformation logic from template to image data model (as a ↵Tryggvi Björgvinsson2012-11-251-7/+8
| | | | | | | | function)
| * A template fix to show the EXIF DateTimeOriginal (as creation date). Added ↵Tryggvi Björgvinsson2012-11-081-0/+8
| | | | | | | | as a configurable option 'original_date_visible' (default false). Since the EXIF tag is a string with the date formatted as 'YYYY:MM:DD HH:MM:SS' the fix slices the string to give only the date and then replaces : by - to conform with the 'Added on' date.
* | Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'Christopher Allan Webber2013-05-101-6/+8
|\ \
| * | Do not render 'Add a comment' button if comments are disabled.David Thompson2013-04-131-6/+8
| | |
* | | Use collection.url_for_self more; Add missing /a.Elrond2013-05-053-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Using collection.url_for_self(request.urlgen) instead of request.urlgen(lengthy) is so much nicer, so using it around the place. Also added a few missing </a> in one template.
* | | Fix-bug-667-Use-lazy_pass_to_ugettext-for-forms.Aditi Mittal2013-04-241-4/+4
| | |
* | | pdf: use pdf.js in an iframeAlon Levy2013-04-151-203/+3
| | |
* | | add pdf media typeAlon Levy2013-04-152-1/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new media type supports pdf and a subset of media recognized by libreoffice via unoconv. Every document added goes through: * conversion to pdf with unoconv if not already a pdf * creation of thumbnail and medium sized image, and pdfinfo generates some information (even for unoconv produces docs - should fix this) Poppler (pdftocairo, pdfinfo) is used. http://poppler.freedesktop.org/ A working but uglified pdf.js integration exists, which is enabled by setting pdf.pdf_js=true mediagoblin_local.ini (disabled in mediagoblin.ini) Adds one test to the test_submission test suite, and another separate test_pdf suite. The tests are only run if media_types.pdf.processing.check_prerequisites passes, so the test suite will not require any extra package. TODO: make test suite say 'skipped' in that case instead of just 'ok' Signed-off-by: Alon Levy <alon@pobox.com>
* | | Comment when/author link styling changesChristopher Allan Webber2013-04-131-2/+4
| | |
* | | Why not also display the times on when these media were createdChristopher Allan Webber2013-04-131-1/+1
| | |