dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,021 Commits 18 Branches 72 Tags
15769857cb576f59dc68174f98db780a87790d71
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mdipierro 4f68c418f8 Merge pull request #1486 from niphlod/fix/1484 
fixes #1484, thanks @abastardi
 2016-10-03 14:48:53 -05:00
mdipierro 99c3e06589 Merge pull request #1483 from niphlod/fix/pymysql_local_imports 
make pymysql usable inside web2py
 2016-10-03 14:48:30 -05:00
mdipierro d602631c7e Merge pull request #1480 from gi0baro/master 
Updated pyDAL to 16.9
 2016-09-30 17:15:25 -05:00
mdipierro 92ca527426 Merge pull request #1481 from ilvalle/compileapp_refactor 
minor compileapp refactor
 2016-09-30 17:15:18 -05:00
mdipierro 91b616d1cf Merge pull request #1482 from niphlod/fix/1407_and_T_v2 
fixes #1407 passing a properly escaped string
 2016-09-30 17:14:45 -05:00
mdipierro 590a505c54 upgraded PyMysql to 0.7.9, thanks niphlod 2016-09-30 16:02:40 -05:00
mdipierro a867a65ebe syncing pydal 16.09 2016-09-30 13:55:48 -05:00
mdipierro b19c3419ec do not cache normal views because of dependencies 2016-09-30 13:54:37 -05:00
mdipierro d03337a737 compile views with . separator anot _ seperator 2016-09-30 11:24:55 -05:00
mdipierro a1154a6f42 reverted 28db54d0e8 changes to compileapp.py 2016-09-30 09:59:08 -05:00
mdipierro 78cc6d69a2 fixed web2py_ajax.html and escaping (not backward compatible fix) 2016-09-27 17:09:05 -05:00
mdipierro 4026357689 fixed undefined var in web2py.js 2016-09-27 16:49:20 -05:00
mdipierro cee7c87859 fixed error in serbian tranlation file 2016-09-27 16:41:17 -05:00
mdipierro fd422faa8f Merge pull request #1476 from kelsa-pi/issue/1451new 
Translation for serbian
 2016-09-27 16:37:01 -05:00
mdipierro 28db54d0e8 Merge pull request #1470 from ilvalle/compileapp_getcfs 
cache (and compile) views, models and controllers
 2016-09-27 16:36:32 -05:00
mdipierro 6be68eb8ab Merge pull request #1469 from niphlod/fix/1069 
fixes #1069, untangles the js, modernizes the approach
 2016-09-27 16:36:02 -05:00
mdipierro b9a606103e Merge pull request #1468 from niphlod/fix/the_new_pydal 
here here, we can update pydal in the wait for a new release soon
 2016-09-27 16:35:13 -05:00
mdipierro 9e80654d2b Merge pull request #1466 from niphlod/fix/system_tests 
fix launching system_tests without coverage
 2016-09-27 16:34:50 -05:00
mdipierro 0e4ff55306 Merge pull request #1461 from niphlod/fix/1310 
fixes #1310 and improves upon ideas shared on #1450
 2016-09-23 13:52:08 -05:00
mdipierro 62d14cca14 Merge pull request #1465 from niphlod/fix/1190 
fixes #1190
 2016-09-23 13:51:54 -05:00
mdipierro e40c4835e7 Merge pull request #1464 from niphlod/fix/1309 
fixes #1309 (and sessions2trash.py, too)
 2016-09-23 13:51:22 -05:00
mdipierro 763e639915 Merge pull request #1463 from niphlod/fix/1407 
fixes #1407, encouraging a sane default
 2016-09-23 13:50:30 -05:00
mdipierro 31d7e1b9b2 Merge pull request #1462 from niphlod/fix/appveyor_pip 
avoid downloading pip as 2.7 has ensurepip
 2016-09-23 13:50:16 -05:00
mdipierro e1ff748ea9 Merge pull request #1460 from niphlod/fix/cleanup 
removed leftover (be careful (BOTH contributors and mergers))
 2016-09-23 13:47:10 -05:00
mdipierro 0e18929905 Merge pull request #1459 from niphlod/fix/1413 
fixes #1413
 2016-09-23 13:46:55 -05:00
mdipierro be1ab1346c Merge pull request #1458 from niphlod/fix/1455 
fixes #1455
 2016-09-23 13:46:36 -05:00
mdipierro 075f493332 Merge pull request #1454 from niphlod/fix/1449 
fixes #1449
 2016-09-21 09:52:55 -05:00
mdipierro ae88d2f297 Merge pull request #1453 from niphlod/fix/1452 
fixes #1452
 2016-09-21 09:52:46 -05:00
mdipierro 0225b68d81 Merge pull request #1450 from ilvalle/getcfs_compiled 
caching read_pyc
 2016-09-21 09:52:32 -05:00
mdipierro 44362aa429 Merge pull request #1448 from abastardi/master 
Avoid folder creation race condition
 2016-09-14 08:49:18 -05:00
mdipierro 0d646fa5e7 Merge pull request #1446 from ilvalle/fix_xmlescape 
fix py3.5 xmlescape with bytes
 2016-09-11 09:45:07 -05:00
mdipierro d96fe2907e Merge pull request #1445 from vinyldarkscratch/translations 
Translations and related improvements
 2016-09-11 09:44:49 -05:00
mdipierro 251724a741 Merge pull request #1440 from niphlod/fix/sys_path_dance3 
fixes #1439
 2016-09-11 09:40:56 -05:00
mdipierro b84b47dad2 Merge pull request #1436 from niphlod/fix/sys_path_dance2 
fix sys.path dance part #2 and scheduler tests for py3
 2016-09-01 10:23:29 -05:00
mdipierro 8370791b83 Merge pull request #1434 from niphlod/fix/sys_path_dance 
first step towards dropping sys.path dance
 2016-08-31 08:09:36 -05:00
mdipierro 326335c3cd Merge pull request #1433 from BuhtigithuB/improve/ubuntu-nginx-script 
No cleartext input password for setup nginx uwsgi ubuntu script
 2016-08-27 22:13:35 -05:00
mdipierro 59315c874d Merge pull request #1431 from ShySec/fix_add_membership 
fixed auth.add_membership succeeding with invalid group_id/user_id
 2016-08-25 00:12:51 -05:00
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
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
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
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
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
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
mdipierro 584327553c fixed Link to Chrome extension that auto-opens error tickets #613 2016-07-11 03:30:48 -05:00
mdipierro 4a3ccfdeab fixed issue #1362, == in args 2016-07-11 03:20:38 -05:00
mdipierro 64df136e69 minor import fix 2016-07-11 03:15:31 -05:00
mdipierro 7fe2684ffa Merge branch 'master' of github.com:web2py/web2py 2016-07-11 03:04:08 -05:00
mdipierro 350dc4ed8b partially addressed scheduler in widget 2016-07-11 03:03:55 -05:00
mdipierro 170ca0eb12 Merge pull request #1390 from BuhtigithuB/improve/jquery-attr-prop-web2py-js 
.att() -> .prop() for setting autocomplete off
 2016-07-11 02:52:24 -05:00
mdipierro ccd807503a Merge pull request #1387 from ilvalle/appveyor_py35 
enabled py35 unittests on win
 2016-07-07 01:48:38 -05:00
mdipierro d067897cef json(indent=...) parameter 2016-07-07 01:47:59 -05:00
mdipierro d2aa83c8a7 Merge branch 'master' of github.com:web2py/web2py 2016-07-05 08:35:58 -05:00
mdipierro c5bd7ca25d look for dal in packages by default 2016-07-05 08:35:42 -05:00
mdipierro b5ea78e5d6 Merge pull request #1385 from jnbrex/master 
Changed tuple to list
 2016-07-02 01:04:04 -05:00
mdipierro d9c2f778ee fixed auth next open redirect 2016-07-01 02:22:15 -05:00
mdipierro 409cfda1f6 Merge pull request #1382 from apa-1/master 
Fix next redirect if only one / exists
 2016-07-01 02:00:58 -05:00
mdipierro 229da5847b Merge pull request #1381 from niphlod/fix/1363 
corner case - fixes #1363
 2016-07-01 02:00:18 -05:00
mdipierro c7eb1c1eae Merge branch 'niphlod-remove/webshell' 2016-07-01 01:59:42 -05:00
mdipierro 67b27f4daf removed webshell 2016-07-01 01:59:12 -05:00
mdipierro 9837aae642 Merge pull request #1378 from niphlod/fix/1331 
fixes #1331 (just rocket, really)
 2016-07-01 01:56:56 -05:00
mdipierro 5413b95320 Merge pull request #1377 from niphlod/fix/1347 
fixes #1347
 2016-07-01 01:56:37 -05:00
mdipierro 5d13e56dc5 Merge pull request #1376 from niphlod/fix/1354 
fixes #1354
 2016-07-01 01:56:21 -05:00
mdipierro 5a5c2b500a Merge pull request #1375 from niphlod/fix/1355 
fixes #1355
 2016-07-01 01:56:02 -05:00
mdipierro 46d02a3448 Merge pull request #1374 from niphlod/fix/1364 
fixes #1364
 2016-07-01 01:55:41 -05:00
mdipierro a99096d6b3 Merge pull request #1373 from ilvalle/py3_fixes_6 
Py3 fixes
 2016-07-01 01:55:24 -05:00
mdipierro 5f80300c5d Merge pull request #1371 from ilvalle/py3_fixes_5 
PY3 fixes
 2016-06-26 00:32:09 -05:00
mdipierro 0b4b71ea09 Merge branch 'master' of github.com:web2py/web2py 2016-06-26 00:30:42 -05:00
mdipierro f8f471f51f new cheatsheet 2016-06-26 00:30:25 -05:00
mdipierro 48350664f0 Merge pull request #1369 from zvolsky/_transl_markmin 
cs translation: removed unwanted '@markmin' literal from translated s…
 2016-06-22 16:39:08 -05:00