Commit Graph

6941 Commits

Author SHA1 Message Date
mdipierro
c63dbf6045 Merge pull request #1429 from ShySec/websocket_compare
use constant-time comparison to verify websocket hmac
2016-08-25 00:12:33 -05:00
mdipierro
82714f31ad Merge pull request #1430 from ShySec/static_path_match
fixed "/app/static" throwing AttributeError instead of HTTP(404)
2016-08-25 00:11:17 -05:00
mdipierro
0cdf3bd832 Merge pull request #1428 from ShySec/pad_update
secure_dumps/secure_loads/pad update
2016-08-25 00:10:53 -05:00
mdipierro
93054a2dca pydal v16.08 2016-08-25 00:09:29 -05:00
kelson
f8f96ba613 fixed /app/static throwing AttributeError instead of HTTP(404) 2016-08-17 16:50:06 -04:00
kelson
b96d0697ee use constant-time comparison to verify websocket hmac 2016-08-17 16:18:44 -04:00
kelson
4b925bf297 added PKCS #7 v1.5 padding
updated secure_dumps to use SHA256
fixed secure_dumps using truncated encryption_key hash
fixed pad ignoring blocksize argument
2016-08-17 16:08:05 -04:00
mdipierro
e87378b07f allow a cllback in streamer 2016-08-16 19:12:47 -05:00
mdipierro
6e9c8212e2 Merge branch 'master' of github.com:web2py/web2py 2016-08-16 19:08:15 -05:00
mdipierro
fb0bca3709 Merge pull request #1425 from zvolsky/_plugin_failure
F redirect in admin/default/design (install of plugin)
2016-08-16 18:50:09 -05:00
mdipierro
a2354addec Merge pull request #1423 from gi0baro/master
Updated pyDAL to 16.08
2016-08-16 18:49:10 -05:00
mdipierro
9158f766e4 Merge pull request #1419 from ilvalle/test_sqlhtml
enabled tests/test_sqlhtml.py
2016-08-16 18:49:02 -05:00
mdipierro
7a20866d4f Merge pull request #1416 from vdubya/master
minor grammatical fix
2016-08-16 18:48:46 -05:00
zvolsky
9e5bf2bf03 F error message in admin/default/design (install of plugin) 2016-08-16 13:38:13 +02:00
zvolsky
16b11c7ef2 F redirect in admin/default/design (install of plugin) 2016-08-16 13:28:29 +02:00
Giovanni Barillari
0528a347b3 Updated pyDAL to 16.08 2016-08-13 15:38:55 +02:00
ilvalle
461e290768 added unittest for sqlform represent 2016-08-08 20:57:43 +02:00
ilvalle
032ee427c6 enabled tests/test_sqlhtml.py 2016-08-07 10:46:07 +02:00
mdipierro
3fc57bd9ad improved fabfile 2016-08-03 03:22:24 -05:00
mdipierro
be5ddca28f fixed last_sql_parse for py3 2016-08-01 05:23:40 -05:00
mdipierro
7440d38253 moved local_html_escape into utils, thanks Simone 2016-08-01 05:19:46 -05:00
mdipierro
2e0630c48c moved local_html_escape into utils, thanks Simone 2016-08-01 05:15:52 -05:00
mdipierro
116a7ff006 removed unwanted hosts.deny 2016-08-01 05:09:39 -05:00
mdipierro
a45bffc908 fixed admin imports 2016-08-01 05:02:52 -05:00
mdipierro
4bb261ec15 fixed py3 import 2016-08-01 04:41:51 -05:00
mdipierro
6543512983 fixed another import error in appadmin 2016-08-01 04:34:33 -05:00
mdipierro
cf12fea68b fixed more imports 2016-08-01 04:26:46 -05:00
mdipierro
68375a4ea7 removed training comma 2016-08-01 04:18:06 -05:00
mdipierro
92a03f397d fixed another _compat import 2016-08-01 04:16:29 -05:00
mdipierro
eebf406d97 fixed import error 2016-08-01 04:13:32 -05:00
mdipierro
cc1ff02079 only one portalocker 2016-08-01 03:46:51 -05:00
mdipierro
35eaba1096 removed duplicated code, using pydal's _compat.py 2016-08-01 03:39:22 -05:00
mdipierro
4519985dc2 fixed indentation in webclient, issue #1396 2016-07-29 08:53:56 -05:00
mdipierro
ab93b74b85 Merge branch 'master' of github.com:web2py/web2py 2016-07-29 08:50:53 -05:00
mdipierro
6be3977fa7 fixed issue #1409, py2 vs py3 2016-07-29 08:50:28 -05:00
mdipierro
fe7a049a0f Merge pull request #1359 from oscarfonts/grid-HTMLExporter-maxtextlength
Don't truncate texts on SQLFORM.grid HTML Export
2016-07-29 08:33:25 -05:00
mdipierro
a6b96ba85b minor change to fabfile 2016-07-29 07:12:29 -05:00
mdipierro
331216c2d4 Merge pull request #1411 from niphlod/fix/1406
fixes #1406
2016-07-29 07:06:35 -05:00
niphlod
3bc6769e28 fixes #1406 2016-07-28 21:36:43 +02:00
Van Woods
fe45dff9e4 minor grammatical fix 2016-07-26 18:16:10 -07:00
mdipierro
59b49e8f4c Merge pull request #1402 from niphlod/fix/py35_and_lock
this crashes win and 3.5
2016-07-25 12:51:33 -05:00
mdipierro
e0d45a3edf Merge pull request #1398 from niphlod/fix/redis_scheduler
feature parity (cron recurrence) with scheduler
2016-07-25 12:50:42 -05:00
niphlod
ae6fdb21c9 this crashes win and 3.5 2016-07-19 22:21:35 +02:00
mdipierro
759616e537 Merge pull request #1400 from niphlod/py3/fix_warnings
fixed most of py3 warnings, output is much cleaner this way
2016-07-18 18:21:24 -05:00
niphlod
cae10a68c0 fixed most of py3 warnings, output is much cleaner this way 2016-07-18 23:45:28 +02:00
niphlod
a0720ce01e feature parity (cron recurrence) with scheduler 2016-07-18 21:36:56 +02:00
mdipierro
7aa617a68f fixed regex (test) 2016-07-17 15:12:04 -05:00
mdipierro
665e14186e fixed issue with sessions in db on GAE 2016-07-17 04:18:56 -05:00
mdipierro
b6fc1b0809 Merge branch 'master' of github.com:web2py/web2py 2016-07-16 10:23:37 -05:00
mdipierro
fe04923d28 Merge pull request #1392 from ilvalle/py3_fixes_7
Py3 fixes
2016-07-16 03:01:16 -05:00