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

7674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mdipierro 5cf2c9696d Merge pull request #1994 from JusticeN/patch-1 
make make_min_web2py.py run for python3
 2018-09-02 10:19:46 -07:00
mdipierro b517282238 Merge pull request #1984 from amerikan/master 
Adds the auto-fill Github issues templates
 2018-09-02 10:19:06 -07:00
mdipierro 842a8d613b Merge pull request #1979 from kelvinspencer/patch-1 
Update web2py_bootstrap.js
 2018-09-02 10:18:02 -07:00
mdipierro 2226862ea9 Merge pull request #1976 from nicozanf/patch-1 
Python 3 compatibility clarification
 2018-09-02 10:17:14 -07:00
mdipierro e87ef4bc3a fixed SimpleXMLRPCDispatcher, thanks Leonel 2018-09-02 10:15:01 -07:00
Wojciech Barcik b28cc5b5c3 Glyphicons replaced with awasome icons in list widget, fix #1974 2018-08-29 19:01:22 +02:00
JusticeN ef4e465222 make make_min_web2py.py run for python3 
i tried to minify the web2py server and this script was not able to run with python3.5.
So i change it.
 2018-08-25 13:45:46 +02:00
jvanbraekel 1cdda4f7f6 Merge https://github.com/jvanbraekel/web2py 2018-08-22 17:53:27 +02:00
jvanbraekel de7aeceac8 Merge pull request #2 from web2py/master 
merge origin changes
 2018-08-22 17:50:14 +02:00
jvanbraekel e04d16bdc1 Align SQLForm.grid selec action left and insure compatibility with bootsrap 4 2018-08-22 17:21:31 +02:00
Faelysse c5547091cf Python3 redis compatibility 
Redis expects int, Python3 <int>/<int> operation returns floatgit
 2018-08-17 16:35:54 +02:00
Nico Zanferrari 83abe91e3a restore original background image 2018-08-16 18:38:55 +02:00
Nico Zanferrari 4f29733fae restore dark navbar 2018-08-16 18:31:13 +02:00
Erik Montes 6b8ccff2a4 Create feature_request.md 2018-08-13 23:36:16 -07:00
Erik Montes e7fee6a417 Create bug_report.md 2018-08-13 23:34:22 -07:00
mdipierro 63972386c2 fixed limitby in sqlhtml grid, thanks Paolo 2018-08-12 10:56:58 -07:00
Koen van Zuijlen 5c626c6d95 Fixed KeyError that occured when trying to retrieve column 'session_data' 2018-08-10 16:06:40 +02:00
Kelvin Spencer 46b8ad3fdd Update web2py_bootstrap.js 
This allows dropdown menu items to be open in the target specified if it exists without changing main/top window
 2018-08-08 08:58:15 -05:00
Nico Zanferrari 7111b3dcb2 Python 3 compatibility clarification 2018-08-08 00:13:23 +02:00
mdipierro 285013a64a version 2.17.1 R-2.17.1 2018-08-05 17:57:11 -07:00
mdipierro bcf288f55d fixed pydal 18.08 2018-08-05 17:56:03 -07:00
mdipierro 88c98cad5c fixed pydal 18.08 2018-08-05 17:22:23 -07:00
mdipierro 2203e0e49f Merge pull request #1970 from web2py/jwt_allow_decorator_fix 
Jwt allow decorator fix
 2018-08-05 17:21:17 -07:00
mdipierro 540bda993f Merge pull request #1967 from misl6/master 
Fixes login_bare + register_bare w/ custom login_userfield
 2018-08-05 17:19:34 -07:00
mdipierro 65b9c9ce17 Merge pull request #1960 from daniellibonati/master 
Proposed Fix for #1959 "Can't initiate simplejsonrpc service object"
 2018-08-05 17:18:29 -07:00
mdipierro 5f9a097505 Merge pull request #1956 from marian-vignau/master 
Proposed fix to solve crash on markdown2 module
 2018-08-05 17:18:00 -07:00
mdipierro b33efddb77 Merge pull request #1954 from gonguinguen/patch-3 
Catch KeyError in download function
 2018-08-05 17:17:28 -07:00
mdipierro 577c45d183 Merge pull request #1951 from yamandu/issue/1950 
correction to generate options also for fields generated with…
 2018-08-05 17:16:47 -07:00
mdipierro 077eb4263d Merge pull request #1946 from leonelcamara/patch-17 
Import urllib stuff from _compat
 2018-08-05 17:14:43 -07:00
mdipierro 2904dae2c3 Merge pull request #1945 from leonelcamara/patch-16 
Import urllib stuff from _compat
 2018-08-05 17:14:29 -07:00