dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,565 Commits 18 Branches 72 Tags
d052d1e06c20f5ea5eba45309f05b17c9967573c
Commit Graph
7565 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Francisco Ribeiro 7aafd05cbb patched flash function to prevent XSS 2018-02-12 11:36:34 +00:00
maxcrystalandGitHub 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
Yi LiuandGitHub 546440ece0 Fix layout.html "Lost Password" link 2018-02-09 11:48:00 -08:00
ilvalle 44e27bf65f fix py3 languages decode added tests. close #1848, thanks @bjquinn 2018-02-09 20:46:00 +01:00
mdipierroandGitHub 82cf2eb44d Merge pull request #1851 from ilvalle/fix_1828 
fix layout
 2018-02-09 12:29:21 -06:00
mdipierroandGitHub 31514060d7 Merge pull request #1847 from leonelcamara/issuesjanuary 
fix print statements in a couple of scripts
 2018-02-09 12:28:09 -06:00
mdipierroandGitHub 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
mdipierroandGitHub f161cc4f3b Merge pull request #1845 from ilvalle/fix_urllib_urlencode 
fix few py3 urllib.urlencode
 2018-02-09 12:27:29 -06:00
mdipierroandGitHub 9e02a768cd Merge pull request #1844 from ilvalle/fix_STYLE_py3 
fix py3 STYLE and SCRIPT tags
 2018-02-09 12:27:01 -06:00
mdipierroandGitHub fce88037bd Merge pull request #1843 from timnyborg/master 
Allow choosing a SAML entityid
 2018-02-09 12:26:34 -06:00
ilvalle 009d5ce48c fix layout, close #1828, thanks @carpaIdea 2018-02-08 20:15:04 +01:00
maxcrystal e02d5e2a60 PY3 fix 2018-02-07 23:46:44 +03:00
Leonel Câmara 521d5bce97 fix print statements in a couple of scripts 2018-02-06 19:48:11 +00: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 NyborgandGitHub 072311fd2c Revert 
Committed in error
 2018-02-02 11:23:48 +00:00
Tim NyborgandGitHub 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 NyborgandGitHub 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
mdipierroandGitHub 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
mdipierroandGitHub f4203ae4d6 Merge pull request #1833 from cccaballero/datewidget 
Fixed welcome app date and datetime widget #1831
 2018-01-07 18:36:00 -06:00
mdipierroandGitHub 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
mdipierroandGitHub 8c9cfff578 Merge pull request #1826 from roaldatwork/p3_admin_translator 
made sorting of translation keys py3 safe
 2018-01-07 18:35:10 -06:00
mdipierroandGitHub 699513b961 Merge pull request #1824 from ilvalle/fix_urllib 
Fix py3 urllib quote_plus
 2018-01-07 18:34:42 -06:00
mdipierroandGitHub b1a9b67c54 Merge pull request #1823 from skz169/skz169-patch-fix-pip 
Fix dependencies in setup.py
 2018-01-07 18:34:11 -06:00
mdipierroandGitHub 8fe4d860a1 Merge pull request #1821 from mrdumpty/patch-1 
Update db.py
 2018-01-07 18:33:56 -06:00
ilvalle b7b16da08f Added the web2py_disable_garbage_collect option to avoid garbage collect 2018-01-07 18:53:33 +01:00
Carlos Cesar Caballero Díaz 6994cee6c9 Fixed wellcome app date and datetime widget #1831 2018-01-05 10:32:46 -05:00
Roald Osinga 9bf8ca9c3b made cas_provider response py3 compatible 2018-01-05 11:49:20 +01:00
Roald Osinga 35a1f6f342 made sorting of translation keys py3 safe 2017-12-13 11:10:08 +01:00
ilvalle f048e45494 removed pycrypto dep 2017-12-12 20:38:56 +01:00
ilvalle cfdda257ed testing py36 on windows 2017-12-12 20:21:54 +01:00
ilvalle dca4639b85 fix urllib quote_plus, close #1822 2017-12-12 19:23:19 +01:00
Sergei KandGitHub 4ecdc2bc73 Update setup.py 2017-12-11 19:59:28 +05:00
mrdumptyandGitHub c7d91108bb Update db.py 
Possible typo?
 2017-12-07 17:10:05 +04:00
mdipierro 4697e0e45b ignore computed fields 2017-12-04 23:45:03 -06:00
mdipierro 4f51647b2f align login menu to right 2017-12-02 14:15:06 -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
mdipierroandGitHub 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
mdipierroandGitHub 130e37d708 Merge pull request #1814 from vinyldarkscratch/patch-1 
Fix update_languages script (use application folder)
 2017-11-22 14:51:19 -06:00
mdipierroandGitHub 160ec9b044 Merge pull request #1811 from timnyborg/master 
Update SQLFORM deleted = False if readonly
 2017-11-22 14:50:39 -06:00