Commit Graph

460 Commits

Author SHA1 Message Date
mdipierro 33f12d91a5 Merge pull request #992 from btreecat/master
Fixed authentication using different login methods.
2015-06-07 21:47:08 -05:00
mdipierro 0e9c5caf4d added request_reset_password_on... 2015-06-07 21:28:18 -05:00
Stephen Tanner 918fdf2f0c Fixed authentication using different login methods. 2015-06-02 12:24:35 -04:00
Mathieu Clabaut a6226d6391 Convert subject and body to unicode before sending mail
Not doing this was raising an exception :

Traceback (most recent call last):
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/restricted.py, line 227, in restricted
    exec ccode in environment
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/applications/foundit/controllers/default.py, line 127, in <module>
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/globals.py, line 393, in <lambda>
    self._caller = lambda f: f()
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/applications/foundit/controllers/default.py, line 34, in user
    return dict(form=auth())
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/tools.py, line 1595, in __call__
    return getattr(self, args[0])()
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/tools.py, line 3272, in request_reset_password
    if self.email_reset_password(user):
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/tools.py, line 3296, in email_reset_password
    message=self.messages.reset_password % d):
  File /base/data/home/apps/e~sacred-bonus-88417/1.384178859090314065/gluon/tools.py, line 798, in send
    subject=subject, body=text, **xcc)
  File /base/data/home/runtimes/python27/python27_lib/versions/1/google/appengine/api/mail.py, line 402, in send_mail
    message.send(make_sync_call=make_sync_call)
  File /base/data/home/runtimes/python27/python27_lib/versions/1/google/appengine/api/mail.py, line 1108, in send
    message = self.ToProto()
  File /base/data/home/runtimes/python27/python27_lib/versions/1/google/appengine/api/mail.py, line 1350, in ToProto
    message = super(EmailMessage, self).ToProto()
  File /base/data/home/runtimes/python27/python27_lib/versions/1/google/appengine/api/mail.py, line 1046, in ToProto
    message.set_subject(_to_str(self.subject))
  File cpp_message.pyx, line 124, in cpp_message.SetScalarAccessors.Setter (third_party/apphosting/python/protobuf/proto1/cpp_message.cc:2229)
TypeError: <class 'gluon.languages.lazyT'> has type <class 'gluon.languages.lazyT'>, but expected one of: str, unicode
2015-05-09 18:24:09 +02:00
mdipierro 279d71d4cd Merge pull request #936 from niphlod/enhancement/919
added newer Recaptcha2 class to deal with v2.0. Fixes #919
2015-05-02 23:07:36 -05:00
niphlod 77f154a56b added newer Recaptcha2 class to deal with v2.0. Fixes #919
Improvements over the "old" v1.0
- behaves well also without javascript
- use_ssl is redundant, v2.0 works only in https mode
- ajax is not useful anymore as the newer API is a lot easier

Adjusted also the addrow() method that was missing newer formstyles.
2015-04-22 00:10:05 +02:00
niphlod 9f1edf267d fixes #931 . Thanks @butsyk for spotting the bug 2015-04-21 21:59:42 +02:00
mdipierro 2a7e9c0c59 possible fix for issue #892 2015-04-01 13:54:48 -05:00
Richard Vézina e4ef75c550 Improve PEP8 gluon/tools.py 2015-03-31 13:56:21 -04:00
mdipierro f1547486c0 fixed attachment on GAE 2015-03-20 13:34:43 -05:00
mdipierro daf371466a fixed issue #789, callable next 2015-03-20 11:05:15 -05:00
niphlod 0086f7d28a first iteration on bs3 cleanup 2015-03-18 23:11:55 +01:00
mdipierro eecce3dd8f faster update_groups 2015-03-12 23:09:19 -05:00
mdipierro 5bed152a0d email cid on GAE 2015-03-01 11:04:37 -06:00
gi0baro 7d6e473cd0 Merge branch 'master' of https://github.com/web2py/web2py into pydal-pip
Conflicts:
	gluon/dal/_load.py
2015-01-22 14:49:07 +01:00
Michele Comitini acab0ad231 auth.settings.*_case_sensitivity support for password retrieval 2015-01-21 01:47:25 +01:00
gi0baro 4b337c3e2c Merge branch 'master' into pydal-pip
Conflicts:
	gluon/__init__.py
	gluon/dal/_load.py
	gluon/dal/adapters/base.py
	gluon/dal/adapters/google.py
	gluon/dal/adapters/postgres.py
	gluon/dal/adapters/teradata.py
	gluon/dal/base.py
	gluon/dal/objects.py
	gluon/tests/__init__.py
	gluon/tests/test_dal_nosql.py
2015-01-17 13:32:06 +01:00
mdipierro 5bc5d0496e R-2.9.12 2015-01-17 00:07:10 -06:00
mdipierro bda69b0e88 mail timeout 2015-01-15 09:47:57 -06:00
mdipierro b872cced33 fixed issue 2001, thanks Anthony 2015-01-12 20:39:14 -06:00
mdipierro 83b94b8207 2.9.12-beta 2015-01-06 11:17:38 -06:00
gi0baro f60c1dff93 Fixing imports for new pydal 2014-12-15 22:24:04 +01:00
gi0baro dcadcf0ffb Added pyDAL from repository, adapted web2py code 2014-12-15 20:13:40 +01:00
Andy Durant db9eeee1c3 enable dropdown-toggle when user logged in 2014-11-13 18:15:41 +00:00
Leonel Câmara 4cf878c9f7 Change reset_password to send the password as GET query var instead of as an argument.
Added some more Portuguese Translations to the Admin application.
2014-10-07 15:15:08 +01:00
gi0baro 5c07c511fa Merge branch 'master' into DAL-modular
* master: (58 commits)
  changed version number
  better types by default, given that we're on 2005 at least
  fix for StorageList and tests added
  improved coverage, fix bug with IS_LIST_OF and items not being strings
  fix cache.increment, added tests
  R-2.9.11
  reverted simplejson
  R-2.9.10
  upgraded memcache and markdown2
  upgraded pypyodbc.py
  upgraded simplejson
  no more split in contains, thanks Niphlod
  fixed wording and bug on contains(), made smart_query use ilike instead of like
  ilike, thanks Niphlod
  CROSS JOIN, thanks jotbe
  added custom represent to GoogleDatastoreAdapter, thanks Alan
  postgresql: identifies what adapter auto-loads json values
  added more tests for json Field
  fixed typo in driver_auto_json
  Improve the graphing to show the name of the application.
  ...

Conflicts:
	gluon/dal.py
	gluon/globals.py
	gluon/tests/test_dal.py
2014-09-25 12:49:16 +02:00
Ricardo Pedroso cd2920c2cf fix infinite loop in request_password 2014-09-12 22:39:25 +01:00
mdipierro cef7202781 fixed is_crypt in tools, thanks Anthony 2014-09-11 12:09:43 -05:00
niphlod 6403878f95 refactored pickle everywhere but Session, removed unused imports 2014-09-10 19:12:10 +02:00
mdipierro 94aab906d5 fixed serialization of Storage objects 2014-09-08 08:10:58 -05:00
gi0baro 5e5e649c28 Added modular DAL, updated gluon imports to new structure 2014-09-03 12:48:03 +02:00
mdipierro f1ab50fb91 fixed a problem with reset_password 2014-09-02 12:17:26 -05:00
mdipierro 5364193759 revent register and other form from ever sending back a password, thanks Anthony 2014-08-27 14:35:36 -05:00
niphlod 7e73faf619 doc fixes 2014-08-21 22:49:26 +02:00
mdipierro 6dfeab284c Merge pull request #479 from leonelcamara/master
reverse_geocode
2014-08-14 19:53:35 -05:00
mdipierro 88e971b9d8 fixed typo default table3cols 2014-08-14 19:40:01 -05:00
mdipierro 7de0861fb5 response.formstyle, reponse.label_separator 2014-08-14 19:10:51 -05:00
Leonel Câmara 4aaf98bc56 removed unneeded sensor=true/false 2014-08-13 16:39:27 +01:00
Leonel Câmara 1548f915a6 added reverse_geocode to tools __all__ 2014-08-13 16:10:00 +01:00
Leonel Câmara 5c29b20000 Merge branch 'master' of git://github.com/web2py/web2py 2014-08-13 16:07:57 +01:00
Leonel Câmara cb927fc1d9 minor cosmetic 2014-08-13 15:59:22 +01:00
Leonel Câmara 3e1a57da50 added a reverse_geocode function to tools 2014-08-13 15:58:04 +01:00
mdipierro bb13d6b729 fixed some bugs and another bs2->bs3 attempt 2014-08-09 01:52:09 -05:00
mdipierro 5c9282aca5 fixed issue 1947, raw args in expose, thanks iiijjjiii 2014-08-08 00:50:42 -05:00
mdipierro 669a22c8be fixed issue 1950, allow change password for any old password complexity 2014-08-08 00:38:10 -05:00
mdipierro 5cbbcd3685 fixed postgresql bug introduced in recent commit? 2014-08-08 00:13:31 -05:00
mdipierro 024912bda1 fixed conflict between GAE and 2-factor authentication 2014-07-28 22:01:48 -05:00
mdipierro b61e8c6132 allow id in email msg 2014-06-25 10:52:36 -05:00
mdipierro d712d3b83c fixed redirect 2014-06-24 12:46:17 -05:00
mdipierro 255dd9777d fixed typo in recent commit 2014-06-14 10:06:13 -05:00