dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,704 Commits 18 Branches 72 Tags
77a5c01ac9a6fe987e2bcbeeaf9b45ef9273d50a
Commit Graph

7704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Nyborg
77a5c01ac9 Allow custom json encoder 
This lets an application use a custom JSONEncoder when making jsonrpc calls (to automatically handle, say, serialization of datetime, or Decimal, or custom classes).

e.g.:
    
import json, datetime, decimal
class ExtendedEncoder(json.JSONEncoder):
    def default(self, obj):
        if isinstance(obj, datetime.datetime):
            return obj.isoformat()
        if isinstance(obj, decimal.Decimal):
            return str(obj)
        return super(ExtendedEncoder, self).default(obj)
    
api = ServerProxy(address, version='2.0', encoder=ExtendedEncoder)
 2018-10-29 15:16:28 +00:00
mdipierro
95709e582d R-2.17.2 R-2.17.2 2018-10-06 11:41:01 -07:00
mdipierro
755275f8ef R-2.17.2 2018-10-06 11:36:23 -07:00
mdipierro
84a33f1a50 Merge branch 'master' of github.com:web2py/web2py 2018-10-06 11:35:29 -07:00
mdipierro
ca5c79c980 R-2.17.2 2018-10-06 11:35:12 -07:00
mdipierro
09e53f495d Merge pull request #2031 from leonelcamara/patch-22 
Use export columns as is supposed instead of selectable ones
 2018-10-06 11:31:14 -07:00
mdipierro
4ede2de037 Merge pull request #2030 from leonelcamara/patch-21 
Show readable fields with a default in create form
 2018-10-06 11:30:14 -07:00
Leonel Câmara
800bd53870 Use export columns as is supposed instead of selectable ones 
Fixes #2014
 2018-10-04 12:43:49 +01:00
Leonel Câmara
4c87932f06 Show readable fields with a default in create form 
Fixes #2006 
This is a backwards compatibility fix.
 2018-10-03 12:53:58 +01:00
mdipierro
8276b30c32 Merge pull request #2026 from nicozanf/patch-1 
Python 3 compatibility + fixed link for cookbook
 2018-09-27 22:19:37 -07:00
mdipierro
6f87a20e26 Merge pull request #2025 from leonelcamara/patch-20 
Python 3 compatibility
 2018-09-27 22:19:20 -07:00
mdipierro
41162c794e Merge pull request #2022 from leonelcamara/patch-19 
Fixes #2020
 2018-09-27 22:18:22 -07:00
Nico Zanferrari
6034368364 Python 3 compatibility + fixed link for cookbook 2018-09-27 21:16:05 +02:00
Leonel Câmara
19c41b308d Update languages.py 2018-09-27 17:57:24 +01:00
Leonel Câmara
f5638c8f6b Python 3 has no cmp function in sorted 2018-09-27 16:22:48 +01:00
Leonel Câmara
904ca403a2 Python 3 compatibility 
Fixes #2024
 2018-09-27 01:53:08 +01:00
Leonel Câmara
d244c34282 Fixes #2020 2018-09-24 22:04:04 +01:00
mdipierro
1715bccac4 Merge pull request #2019 from hrother/sqlform_factory_validators 
Testcase for #2007
 2018-09-23 10:44:37 -07:00
mdipierro
abf3ca54bf Merge pull request #2018 from leonelcamara/fix726 
Fixes #726
 2018-09-22 18:48:21 -07:00
mdipierro
2440932579 Merge pull request #2017 from leonelcamara/fixfactoryvalidators 
Fixes #2007
 2018-09-22 18:47:51 -07:00
mdipierro
02e14d91e1 Merge pull request #2016 from inpos/master 
Python 3 compat
 2018-09-22 18:44:25 -07:00
mdipierro
e9547d219a Merge pull request #2008 from leonelcamara/samesite 
Add SameSite support
 2018-09-22 18:43:38 -07:00
Holger Rother
70bb497b96 Simplify testcase 2018-09-22 09:55:26 +02:00
Holger Rother
398fc6de37 Testcase for #2007 2018-09-21 07:58:12 +02:00
Leonel Câmara
50692a4fd3 Fixes #726 2018-09-20 18:59:41 +01:00
Leonel Câmara
11b441b777 Make SameSite=Lax the default for all web2py apps 2018-09-20 13:02:09 +01:00
Leonel Câmara
62f5372876 Fixes #2007 2018-09-20 12:47:05 +01:00
Бородин Роман
fba90d31f4 Error 'dict_items += list' when try to save code-editor settings 2018-09-19 11:06:04 +03:00
Бородин Роман
9375ea7378 TypeError when try to disable appliance 2018-09-19 10:57:57 +03:00
mdipierro
e697bdaf90 Merge branch 'master' of github.com:web2py/web2py 2018-09-17 21:36:54 -07:00
mdipierro
7bddd67a61 fixed basestring in template.py filenames, thanks appjarbiz 2018-09-17 21:32:41 -07:00
mdipierro
93c05240b7 Merge pull request #2009 from misl6/master 
Fixes request_reset_password w/ custom userfield
 2018-09-17 06:29:16 -07:00
mdipierro
2f1db7dfa2 Merge pull request #2005 from Faelysse/master 
HTTP header date made independent of locale, fixes #1997
 2018-09-17 06:24:32 -07:00
mdipierro
0389a45034 Merge pull request #2004 from DonaldMcC/issue/2003 
Issue/2003
 2018-09-17 06:23:34 -07:00
mdipierro
ec53580a76 Merge pull request #2002 from JusticeN/patch-2 
changing the anyserver.py to make it run with py3
 2018-09-17 06:22:45 -07:00
Mirko Galimberti
09c8b5eced skip requires on custom userfield 2018-09-07 10:23:07 +02:00
Leonel Câmara
928fd364cf Add SameSite support 2018-09-06 16:16:44 +01:00
Mirko Galimberti
55a2f4a6b2 Fixes request_reset_password w/ custom userfield 2018-09-06 14:58:03 +02:00
Faelysse
6e0da9cea7 HTTP header date made independent of locale, fixes #1997 2018-09-06 14:46:07 +02:00
Donald McClymont
9364aa2036 Support for compiled apps on python 3.7 and above - marshal_header_size increased to 16 for those cases - tested by compiling and running welcome app on py 2.7,3.6 and 3.7 2018-09-05 23:34:05 +01:00
Donald
48806ccd8f Merge pull request #1 from web2py/master 
merge my branch forward hopefully
 2018-09-05 22:52:36 +01:00
JusticeN
80582daaa0 changing the anyserver.py to make it run with py3 
actually fixing the issue #1993 i have created.
i tested it successfuly with the command python3 anyserver.py -s tornado -i 127.0.0.1 -p 80 -l
 2018-09-05 14:17:33 +02:00
mdipierro
33c6dd9656 fixed broken connection in scheduler, thanks Bart 2018-09-02 10:45:06 -07:00
mdipierro
1c8790271d Merge pull request #1995 from wojtek555/issue/1974 
Glyphicons replaced with awasome icons in list widget, fix #1974
 2018-09-02 10:27:04 -07:00
mdipierro
f8cba1e5c4 Merge pull request #1992 from jvanbraekel/master 
Update the style of SQLgrid select actions
 2018-09-02 10:26:40 -07:00
mdipierro
f2aacd93c8 Merge pull request #1991 from Faelysse/master 
Python3 redis compatibility
 2018-09-02 10:25:59 -07:00
mdipierro
02b02f73bd Merge pull request #1989 from nicozanf/patch-2 
partially restore original layout for Welcome page
 2018-09-02 10:25:25 -07:00
mdipierro
af69716bf0 Merge pull request #1982 from kvanzuijlen/fix_issues_for_python3 
Fixed KeyError that occured when trying to retrieve column 'session_data'
 2018-09-02 10:23:36 -07:00
mdipierro
433ef09d2c Merge pull request #1924 from blackthorne/master 
added task broadcasting for workers within a group
 2018-09-02 10:22:18 -07:00
mdipierro
2859994bbe Merge branch 'master' of github.com:web2py/web2py 2018-09-02 10:21:53 -07:00