Commit Graph

7846 Commits

Author SHA1 Message Date
mdipierro 7e1e767d8f syncing pydal 2019-03-14 21:00:11 -07:00
mdipierro b6f8ad1a54 R-2.18.4 2.18.4 2019-03-12 22:22:04 -07:00
mdipierro 483820c5ed Merge branch 'master' of github.com:web2py/web2py 2019-03-12 21:32:55 -07:00
mdipierro 879d8aeffd many many regex improvements, thanks Paolo 2019-03-12 21:32:03 -07:00
mdipierro bc1e417f3b Merge pull request #2145 from leonelcamara/expose
don't use a regex to find exposed functions
2019-03-12 21:18:51 -07:00
mdipierro f0bd9ed002 Merge pull request #2144 from leonelcamara/patch-28
Fixes #2143
2019-03-12 21:17:39 -07:00
Leonel Câmara cc235d3142 don't use a regex to find exposed functions 2019-03-12 11:33:41 +00:00
Leonel Câmara 1619a55802 Fixes #2143 2019-03-12 00:02:11 +00:00
mdipierro aff4f98fe1 Merge pull request #2138 from nickinho/master
Update oauth20_account.py
2019-03-10 16:54:12 -07:00
mdipierro 7e3fbef25a Merge pull request #2134 from vinyldarkscratch/translations/welcome/de
Update translations for welcome/de
2019-03-10 16:53:31 -07:00
nickinho e8d56bbba9 Update oauth20_account.py
Adding python 2/3 compatibility.
2019-03-08 13:58:54 +01:00
mdipierro 73f49379ed syncing pydal 2019-03-07 22:19:04 -08:00
Vinyl Darkscratch 27c34fc531 Merge remote-tracking branch 'web2py/master' 2019-03-07 21:47:58 -08:00
mdipierro 9e6cef56ba Merge pull request #2135 from leonelcamara/patch-27
Fix: Avoid possible NameError
2019-03-07 21:46:51 -08:00
mdipierro a8734411c4 Merge pull request #2133 from vinyldarkscratch/translations/update-files
Remove random trailing whitespace in language files
2019-03-07 21:45:37 -08:00
mdipierro 542904f83d Merge pull request #2132 from vinyldarkscratch/gitignore
Ignore __pycache__ folders
2019-03-07 21:45:22 -08:00
Leonel Câmara a339381a67 Fix: Avoid possible NameError 2019-03-07 20:26:15 +00:00
Vinyl Darkscratch afff1e50ec Remove random trailing whitespace in language files 2019-03-06 21:23:20 -08:00
Vinyl Darkscratch e74e94c52b Ignore __pycache__ folders 2019-03-06 21:21:01 -08:00
Vinyl Darkscratch 007cf42f89 Update translations for welcome/de 2019-03-06 21:19:18 -08:00
mdipierro f60f931299 Merge pull request #2131 from vinyldarkscratch/translations/update-files
Update language files
2019-03-06 20:12:13 -08:00
mdipierro a72aabfbb4 Merge pull request #2129 from leonelcamara/patch-25
Fix unclosed string typo
2019-03-06 20:10:49 -08:00
Vinyl Darkscratch 93f2ec342a Update languages for admin 2019-03-06 17:02:02 -08:00
Vinyl Darkscratch c18fc53d33 Update languages for welcome 2019-03-06 16:47:15 -08:00
Leonel Câmara 2d6eb5cf5d Fix unclosed string typo
see https://groups.google.com/forum/#!topic/web2py/DykU5wPQ614
2019-03-06 13:58:09 +00:00
mdipierro f56a19b0af syncing pydal 2019-03-05 20:05:23 -08:00
mdipierro 4b59b289de Merge branch 'master' of github.com:web2py/web2py 2019-03-04 21:46:35 -08:00
mdipierro d3a41f3a65 syncing pydal 2019-03-04 21:46:22 -08:00
mdipierro 910754c5c7 Merge pull request #2127 from leonelcamara/patch-24
Fix b' in session.flash when storing a LazyT
2019-03-04 19:54:26 -08:00
Leonel Câmara 701b6e1ebd Fix b' in session.flash when storing a LazyT
probably Fixes #2110 as putting T('foo') in the session was the only way I could reproduce it
2019-03-04 17:11:04 +00:00
mdipierro 0fc807e5cf syncing pydal 2019-03-04 01:03:23 -08:00
mdipierro 63ad7fb4ec new pydal 2019-03-04 00:59:02 -08:00
mdipierro e97c458fff reinstated commented tests 2019-03-04 00:27:41 -08:00
mdipierro bfc3169239 validators moved into pydal 2019-03-04 00:26:17 -08:00
mdipierro ca3fd90acc new validators pass all tests 2019-03-04 00:08:13 -08:00
mdipierro 26f1b8c84b new validators and adapted tests 2019-03-03 23:54:49 -08:00
mdipierro 6128d03d4b R-2.18.3 R-2.18.3 2019-03-03 15:08:28 -08:00
mdipierro dd27abc770 Merge pull request #2125 from nicozanf/master
fix for building python 3 windows binaries
2019-03-03 15:03:59 -08:00
mdipierro 9e7b2b0b0b R-2.18.3 2019-03-03 15:02:35 -08:00
mdipierro e09655b112 fixed translator 2019-03-03 14:27:12 -08:00
mdipierro 399b57d13e fixed import of local packages 2019-03-03 14:14:19 -08:00
mdipierro 2941aa13da fixed admin save 2019-03-03 13:53:12 -08:00
Nico Zanferrari c1e5571de8 fix for building python 3 windows binaries 2019-03-03 22:26:46 +01:00
mdipierro a828cb2124 Merge pull request #2115 from leonelcamara/patch-23
py3 compat don't use keys()[0]
2019-03-02 23:08:04 -08:00
mdipierro 5a848e51a3 Merge pull request #2107 from vinyldarkscratch/validators/is_file
Add new IS_FILE validator
2019-03-02 23:07:22 -08:00
mdipierro 8477b77c56 Merge pull request #2104 from leonelcamara/valbcompat
Validators backwards compatibility fix
2019-03-02 23:06:00 -08:00
mdipierro 9bee5906d9 Merge pull request #2103 from erbalito/patch-3
resolves #1729
2019-03-02 23:04:38 -08:00
mdipierro 70ccecb1ab Merge pull request #2100 from erbalito/patch-1
Update redis_cache.py
2019-03-02 23:03:18 -08:00
mdipierro f2b8cdf684 Merge pull request #2099 from erbalito/patch-2
resolves #2098
2019-03-02 23:02:25 -08:00
Leonel Câmara ef6814d452 py3 compat
Fixes #2114
2019-03-01 15:05:26 +00:00