Commit Graph
100 Commits
Author SHA1 Message Date
mdipierro eaa34a7f9f Merge pull request #2032 from rayluo/generic-csv
Create generic.csv
2018-11-01 08:18:35 -07:00
mdipierro 95709e582d 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
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
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
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
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
mdipierro 63972386c2 fixed limitby in sqlhtml grid, thanks Paolo 2018-08-12 10:56:58 -07:00
mdipierro 285013a64a version 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
mdipierro 225380d00b Merge pull request #1944 from leonelcamara/patch-15
PY3 compatibility
2018-08-05 17:14:16 -07:00
mdipierro fc295bb617 Merge pull request #1943 from leonelcamara/patch-14
fixed XML import
2018-08-05 17:14:03 -07:00
mdipierro 6438200923 Merge pull request #1942 from jvanbraekel/master
Use request_reset_password +  PDF and TSV exports
2018-08-05 17:13:45 -07:00
mdipierro 8c7955e107 Merge pull request #1937 from sugizo/add_docker
add another server in some os (docker)
2018-08-05 17:12:12 -07:00
mdipierro d7624b95f8 fixed a typo in validators, thanks Paolo 2018-06-15 05:08:12 +02:00
mdipierro 09271bff5f simplfied a test, thanks Paolo 2018-06-15 05:07:28 +02:00
mdipierro f239882d32 fxed various sqlhtml bugs, thanks Paolo 2018-06-15 05:06:49 +02:00
mdipierro 14083907e5 Merge pull request #1936 from sugizo/add_docker
add docker
2018-06-01 13:55:51 -05:00
mdipierro c358d2a851 better validators and comments, thanks Paolo 2018-06-01 13:34:27 -05:00
mdipierro 319490edc1 fixed one more test 2018-06-01 13:19:35 -05:00
mdipierro 7fce2d04af fixed tests for IS_LIST_OF 2018-06-01 12:56:45 -05:00
mdipierro c3f11dc976 Merge pull request #1935 from sugizo/fix_anyserver_cherrypy
anyserver.py with cherrypy
2018-06-01 12:45:21 -05:00
mdipierro 246b5293e5 Merge pull request #1933 from jvanbraekel/master
Update layout navbar for centering navbar items
2018-06-01 12:44:50 -05:00
mdipierro d383da31c8 Merge pull request #1928 from umbromancer/master
Added missing config section in Scheduler
2018-06-01 12:44:20 -05:00
mdipierro eaaa9203f7 Merge pull request #1927 from alexandremasbr/fixes_layout_to_translate
fixes allow translate strings at views/default/user.html
2018-06-01 12:43:42 -05:00
mdipierro 7176524e4f Merge pull request #1926 from alexandremasbr/language_pt_br_corrections
fixes in languages/pt-br.py
2018-06-01 12:43:19 -05:00
mdipierro e740451b69 Merge pull request #1923 from robinvandernoord/patch-1
Changed file to open
2018-06-01 12:41:40 -05:00
mdipierro 4d9eaf1ac4 Merge pull request #1922 from cccaballero/user_page_bottom_margin
Add bottom margin on welcome user page
2018-06-01 12:41:18 -05:00
mdipierro dfd5752814 Merge pull request #1921 from leonelcamara/patch-13
Fixes #1918
2018-06-01 12:40:58 -05:00
mdipierro d2de59c05d Merge pull request #1917 from cccaballero/NEWINSTALL_file_unlink
#1911 NEWINSTALL file unlink issue
2018-06-01 12:40:28 -05:00
mdipierro 8d865f1c5f better error handing in IS_LIST_OF, thanks Paolo 2018-05-24 11:17:49 -05:00
mdipierro bb338ef19c added acknowledgement to Paolo Pastori 2018-05-13 20:15:30 -05:00
mdipierro ae60debc90 fixed up export 2018-05-06 15:09:11 -05:00
mdipierro 4ed36cfb1f welcome improvements 2018-05-01 16:08:40 -05:00
mdipierro fda67e1be5 request method 2018-05-01 15:58:14 -05:00
mdipierro 4130f87c62 fixed languages.py py3 bug 2018-05-01 15:53:19 -05:00
mdipierro 891348986c fixed test 2018-05-01 11:38:08 -05:00
mdipierro d2290eb3d5 better tests for languages.py, thanks Paolo 2018-05-01 11:10:08 -05:00
mdipierro 3170c360aa improved docstring and comments in languages.py, thanks Paolo 2018-05-01 11:09:17 -05:00
mdipierro 38482d4846 better highlight.py, thanks Paolo 2018-05-01 11:06:36 -05:00
mdipierro e8df84caa8 fixed logging example, thanks Paolo Pastori 2018-05-01 10:54:04 -05:00
mdipierro 13ff0877fd fixes #1596, thanks Paolo Pastori 2018-05-01 10:51:42 -05:00
mdipierro 0226eb5286 Merge pull request #1914 from cccaballero/fix_welcome_styles
Fix welcome styles
2018-04-29 19:51:28 -05:00
mdipierro de256cfb28 Merge pull request #1910 from richboss/typo2
fix editing mistakes
2018-04-29 19:51:14 -05:00
mdipierro ad9ed5a9c4 Merge pull request #1909 from richboss/typo
fix my own correction mistake (forms -> formats)
2018-04-29 19:50:51 -05:00
mdipierro a79ec41b3b Merge pull request #1908 from leonelcamara/make_sure_to_unlock_redis
Release the lock even if function call fails
2018-04-29 19:50:33 -05:00
mdipierro 9fb33e6b93 Merge pull request #1907 from leonelcamara/fix1905
Fixes #1905
2018-04-29 19:50:13 -05:00
mdipierro 8ae34dd8ad Merge pull request #1906 from amerikan/master
Updated Welcome appadmin page styling
2018-04-29 19:49:56 -05:00
mdipierro f0eb120bba Merge pull request #1904 from n1k9/master
Modify dispacher for differente response element name
2018-04-29 19:49:10 -05:00
mdipierro 2f0f3075b0 allow web2py.py -S c/a/f?x=y 2018-04-24 17:40:47 -05:00
mdipierro cf52195b44 Merge branch 'master' of github.com:web2py/web2py 2018-04-19 00:17:39 -05:00
mdipierro 94a9bfd05f Merge pull request #1901 from richboss/defunct_links
weed out broken links
2018-04-18 22:02:40 -05:00
mdipierro 8053d42689 Merge pull request #1899 from richboss/typos2
fix editing mistakes
2018-04-18 22:02:21 -05:00
mdipierro 039da93b14 Merge branch 'master' into typos2 2018-04-18 22:02:13 -05:00
mdipierro 5df23179b5 Merge pull request #1900 from richboss/rocket
supply missing link to Rocket Web Server
2018-04-18 22:01:33 -05:00
mdipierro 10171ac4c6 Merge pull request #1898 from richboss/typos
fix editing mistakes
2018-04-18 22:01:11 -05:00
mdipierro ddb2f0ebc3 Merge pull request #1897 from rif/master
Python3 fixes
2018-04-18 22:00:53 -05:00
mdipierro 2d500d4cc8 Merge pull request #1896 from cccaballero/set_ldap_python_log_levels
Add support for Python logger logging levels in LDAP auth
2018-04-18 22:00:07 -05:00
mdipierro 53c1f67195 Merge pull request #1895 from cccaballero/fix_ldap_bytes_error
Fixed Python 3.x LDAP bug on user firstname and lastname part
2018-04-18 21:59:44 -05:00
mdipierro 1e450ed1d6 Merge pull request #1888 from BuhtigithuB/fix/recapchat-v1-deprecated
Close #1887 - remove Recaptcha V1
2018-04-18 21:59:13 -05:00
mdipierro 5de8cb4da5 fixed syntax for attachemnts, thanks Paolo Pastori 2018-04-03 11:24:32 -05:00
mdipierro 8d4dc1b373 fixed logging issue when invalid user_id 2018-04-03 00:22:19 -05:00
mdipierro cec14c741a fixed no-email edit in profile 2018-04-02 23:53:05 -05:00
mdipierro 2237076a5a Merge pull request #1884 from tyrbonit/master
Fix UnicodeDecodeError
2018-03-20 16:55:34 -05:00