Commit Graph

5269 Commits

Author SHA1 Message Date
ilvalle fa31a6b61b Added test for T used in HTML tags, fix language encode(), close #1856 2018-02-12 21:13:19 +01:00
maxcrystal adb85d3061 Merge pull request #1 from web2py/master
Merge from web2py
2018-02-11 08:18:09 +03:00
Daniel Libonati 79ba8cb6e4 Added row class to form-group so form becomes inline in Bootstrap v4 2018-02-10 22:07:01 -03:00
ilvalle c3355b7457 fix missing reload py3, close #1760 2018-02-09 20:56:16 +01:00
ilvalle 44e27bf65f fix py3 languages decode added tests. close #1848, thanks @bjquinn 2018-02-09 20:46:00 +01:00
mdipierro 1d489d0fde Merge pull request #1846 from ilvalle/fix_scheduler_async_py37
fix py37 conflict due to async definition in scheduler
2018-02-09 12:27:49 -06:00
mdipierro f161cc4f3b Merge pull request #1845 from ilvalle/fix_urllib_urlencode
fix few py3 urllib.urlencode
2018-02-09 12:27:29 -06:00
mdipierro 9e02a768cd Merge pull request #1844 from ilvalle/fix_STYLE_py3
fix py3 STYLE and SCRIPT tags
2018-02-09 12:27:01 -06:00
maxcrystal e02d5e2a60 PY3 fix 2018-02-07 23:46:44 +03:00
ilvalle d1efc8b55d fix py37 conflict due to async definition in scheduler 2018-02-04 10:02:14 +01:00
ilvalle ad3c69155b fix few urllib.urlencode, close #1841 2018-02-04 09:58:16 +01:00
ilvalle 421aec162a fix py3 STYLE and SCRIPT tags, close #1835 2018-02-04 09:41:57 +01:00
Tim Nyborg 072311fd2c Revert
Committed in error
2018-02-02 11:23:48 +00:00
Tim Nyborg 5dcbae0b37 Update saml2_auth.py
Pass along any _next url var as part of the outstanding queries, so web2py will know where to send the user once they come back from singing on.  

Useful if the SAML auth is part of a CAS, because otherwise the user is sent from the CAS consumer -> CAS -> SSO -> CAS, and is never returned to the consumer application
2018-02-02 11:03:04 +00:00
Tim Nyborg 76f3384aae Allow choosing a saml entityid
Allows you to pick an entityid when using federation XML data or an MDQ with many entries.  Pysaml2's MDQ metadata is loaded lazily, after you provide a key, so it's necessary to pass the entityid as a key
2018-02-01 14:04:47 +00:00
mdipierro f9606fabde Merge branch 'master' of github.com:web2py/web2py 2018-01-12 17:07:07 -06:00
mdipierro 623f3b9947 Merge pull request #1834 from ilvalle/avoid_garbage_collect
Added the web2py_disable_garbage_collect option to avoid garbage collect
2018-01-12 17:06:05 -06:00
mdipierro 089359f3ea Merge pull request #1832 from roaldatwork/cas_provider_py_compatibilty
made cas_provider response py3 compatible
2018-01-07 18:35:34 -06:00
mdipierro 699513b961 Merge pull request #1824 from ilvalle/fix_urllib
Fix py3 urllib quote_plus
2018-01-07 18:34:42 -06:00
ilvalle b7b16da08f Added the web2py_disable_garbage_collect option to avoid garbage collect 2018-01-07 18:53:33 +01:00
Roald Osinga 9bf8ca9c3b made cas_provider response py3 compatible 2018-01-05 11:49:20 +01:00
ilvalle dca4639b85 fix urllib quote_plus, close #1822 2017-12-12 19:23:19 +01:00
mdipierro 4697e0e45b ignore computed fields 2017-12-04 23:45:03 -06:00
mdipierro 79b877f6b4 create forms should not display default values for readonly fields (third attempt) 2017-12-02 13:52:20 -06:00
mdipierro 553b7cf51a create forms should not display default values for readonly fields 2017-12-02 13:46:22 -06:00
mdipierro 20411ce45f create forms should not display default values for readonly fields 2017-12-02 13:37:42 -06:00
mdipierro b11d6f6498 removed share 2017-12-02 13:30:19 -06:00
mdipierro 44c3c3b0e4 Merge branch 'master' of github.com:web2py/web2py 2017-12-02 13:03:13 -06:00
mdipierro e9dcac4ecd Merge pull request #1818 from ilvalle/py3.6dev
fix include_meta for py35, added tests
2017-12-02 13:01:12 -06:00
mdipierro 4a2a02d1fe fixed display of computed fields 2017-12-02 12:52:15 -06:00
ilvalle 622b29366a fix include_meta for py35, added tests. close #1816 2017-12-02 11:03:46 +01:00
mdipierro 160ec9b044 Merge pull request #1811 from timnyborg/master
Update SQLFORM deleted = False if readonly
2017-11-22 14:50:39 -06:00
mdipierro ee8c401020 Merge pull request #1807 from abastardi/janrain-fix
Fix Janrain due to change in behavior
2017-11-22 14:50:30 -06:00
Tim Nyborg b732ab6d53 Update SQLFORM deleted = False if readonly
fixes the following syntax:

form = SQLFORM(table, record, readonly=readonly, deletable=True)

form.process()

if form.deleted:
   pass
elif form.accepted:
   pass
2017-11-17 16:53:27 +00:00
abastardi 071622b9d9 Fix Janrain due to change in behavior
Janrain has started providing the login token via a POST request
in addition to including it in the query string. This results
in request.vars.token being a list containing two copies of the
token, which breaks the web2py code. This change keeps just a single
copy of the token.
2017-11-15 14:52:19 -05:00
Leonel Câmara fd0f169a55 Update list of TLDs 2017-11-14 18:20:13 +00:00
mdipierro c9fd0fd71e fixed test because of layout change 2017-11-14 00:55:59 -06:00
mdipierro 999e7b7512 fixed layout in lack of configuration 2017-11-14 00:47:40 -06:00
mdipierro 65b3e6dda9 support for bootstrap4 2017-11-13 23:29:34 -06:00
mdipierro d424e5d317 Merge pull request #1610 from geomapdev/dal-enhancements
handle reference fields for keyed tables
2017-11-13 21:24:07 -06:00
mdipierro a1417df67c Merge branch 'master' of github.com:web2py/web2py 2017-11-13 21:15:04 -06:00
mdipierro 551c19bcaf Merge pull request #1761 from josedesoto/issue/update_role_on_update_profile
Update groups on edit profile
2017-11-13 21:14:02 -06:00
mdipierro 7c1fb6643e fllowing pydal v17.11 2017-11-13 21:12:06 -06:00
Leonel Câmara 12253ab757 Fix #1715 2017-11-13 15:31:05 +00:00
mdipierro 30b3d84f24 fixed options when type is list 2017-11-10 22:31:35 -06:00
mdipierro 166e268308 improved handling of regex and options field attributes 2017-11-10 18:50:52 -06:00
mdipierro 14e58276cf form handling of f.options, f.regex, f.listable, f.rearchable 2017-11-10 18:41:41 -06:00
mdipierro eb7222aa92 Merge pull request #1802 from leonelcamara/fixsqltable
Fix a problem with Expressions in SQLTABLE
2017-11-10 18:12:50 -06:00
mdipierro 009a0b87f2 Merge pull request #1801 from leonelcamara/i1800
Fixes #1800
2017-11-10 18:12:16 -06:00
mdipierro 934042fc04 Merge pull request #1796 from vitkarpenko/middleware_status_code
gluon.http expects status code as integer while LazyWSGI generates str
2017-11-10 18:09:37 -06:00