Commit Graph

7031 Commits

Author SHA1 Message Date
Vinyl Darkscratch 3e2b8f89aa Merge remote-tracking branch 'web2py/master' into translations 2016-10-10 20:45:42 -07:00
mdipierro e6a3081b42 Merge pull request #1494 from niphlod/fix/appadmin
fix issue with regex
2016-10-07 11:17:45 -05:00
niphlod 27ce91474d fix issue with regex 2016-10-07 13:10:44 +02:00
mdipierro 1877f49730 Merge pull request #1490 from niphlod/fix/1485
fixes #1485, thanks @abastardi once again
2016-10-04 19:40:11 -05:00
mdipierro b8c1d39375 Merge pull request #1489 from niphlod/fix/appadmin
remove __pycache__ from the list of apps
2016-10-04 19:39:50 -05:00
mdipierro a9d3d31417 merged with niphlod 2016-10-03 17:42:39 -05:00
niphlod b9c1b4d62b fixes #1485, thanks @abastardi once again 2016-10-04 00:40:29 +02:00
niphlod a1c1d1357f remove __pycache__ from the list of apps
in case someone wonders how many core devs are actively using the admin
app...here's the evidence ^_^'
2016-10-04 00:30:11 +02:00
mdipierro cf9b2d8fa0 Merge pull request #1487 from niphlod/fix/update_pg8000
updates pg8000 driver and freshens travis.yml
2016-10-03 17:27:03 -05:00
niphlod bcc237ead8 removing pycrypto hard dep 2016-10-04 00:11:54 +02:00
niphlod 15769857cb 1st trial 2016-10-03 22:16:55 +02:00
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
niphlod b7219ba2fd fixes #1484, thanks @abastardi 2016-10-03 21:09:27 +02:00
niphlod 9256d67ec7 remove pymysql dependency 2016-10-01 11:25:52 +02:00
niphlod 9539cc7542 make pymysql usable inside web2py 2016-10-01 00:15:47 +02: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
niphlod 3a6df38d62 fixes #1407 passing a properly escaped string 2016-09-29 00:12:59 +02:00
ilvalle a31cf09dd3 minor compileapp refactor 2016-09-28 21:49:24 +02:00
Giovanni Barillari 3ab30295ed Updated pyDAL to 16.9 2016-09-28 13:10:42 +02: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
sasa e9473f570f Translation for serbian 2016-09-25 20:03:23 +02:00
ilvalle 4468355d01 fix py3 xmlrpc imports, close #1473 2016-09-25 10:43:42 +02:00
ilvalle b4acfd0724 removed unnecessary env clone for _view_environment 2016-09-25 10:11:47 +02:00
ilvalle 576aaf668d cache (and compile) parse_template in run_view_in, fix #1474 2016-09-25 10:08:26 +02:00
niphlod 9978e63621 fixes #1069, untangles the js, modernizes the approach
plus, avoids hitting the backend for each and every keypress...
2016-09-23 23:45:00 +02:00
niphlod 54da251e46 here here 2016-09-23 21:17:43 +02:00
niphlod 55f929bab4 fix launching system_tests without coverage 2016-09-23 20:52:30 +02: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