 mdipierro
|
532137bce5
|
Merge pull request #1594 from BuhtigithuB/improve/translations
Improve french translation and close #1592
|
2017-03-21 12:24:44 -05:00 |
|
|
mdipierro
|
35f7caa2f0
|
Merge pull request #1591 from cccaballero/master
Some fixes on ldap_auth
|
2017-03-21 12:24:05 -05:00 |
|
|
mdipierro
|
98dddee697
|
Merge pull request #1578 from ndegroot/minorcleanupbs3
minor cleanup removed unused class 'navbar-ex1-collapse' see https://…
|
2017-03-21 12:22:48 -05:00 |
|
|
mdipierro
|
5000c47472
|
Merge pull request #1568 from amerikan/patch-2
Remove ! from tag
|
2017-03-21 12:22:16 -05:00 |
|
|
mdipierro
|
bf3d53ad96
|
Merge pull request #1567 from amerikan/patch-3
Removed ! from tag
|
2017-03-21 12:21:13 -05:00 |
|
|
mdipierro
|
b2f221bbaa
|
Merge pull request #1566 from BrenBarn/flexserve
Add FlexibleService, which allows @service-style methods with varargs
|
2017-03-21 12:18:09 -05:00 |
|
|
mdipierro
|
868d6f6369
|
Merge branch 'master' of github.com:web2py/web2py
|
2017-03-21 12:06:11 -05:00 |
|
|
mdipierro
|
0e1831bcc7
|
Merge pull request #1581 from nextghost/pydal-17.01
Update SQLTABLE for API changes in PyDAL 17.01
|
2017-03-21 12:06:00 -05:00 |
|
|
mdipierro
|
dda808ebda
|
pydal 17.03
|
2017-03-21 12:05:47 -05:00 |
|
|
mdipierro
|
f31c9002f7
|
reverted pydal 16.11
|
2017-03-21 00:42:02 -05:00 |
|
|
mdipierro
|
6354fbedf8
|
commented a test
|
2017-03-21 00:24:17 -05:00 |
|
|
mdipierro
|
cc11a14ce3
|
commented a test
|
2017-03-21 00:21:21 -05:00 |
|
|
mdipierro
|
2fa9597cd8
|
added debug info
|
2017-03-21 00:04:55 -05:00 |
|
|
mdipierro
|
c9d656ea45
|
added logging, thanks gi0baro
|
2017-03-20 18:06:23 -05:00 |
|
|
mdipierro
|
1eec01b830
|
pydal 17.03
|
2017-03-20 16:21:05 -05:00 |
|
|
mdipierro
|
c10983b191
|
Merge branch 'master' of github.com:web2py/web2py
|
2017-03-20 16:15:31 -05:00 |
|
|
mdipierro
|
975ab7b923
|
SQLFORM.grid(showblobs=True)
|
2017-03-20 16:15:18 -05:00 |
|
|
mdipierro
|
16f60d5cff
|
Merge pull request #1565 from kristjanvalur/master
Update compileapp.py
|
2017-01-30 12:48:37 -06:00 |
|
|
mdipierro
|
930370ee91
|
Merge pull request #1562 from richboss/dev_urandom
don't write to /dev/urandom on Windows platforms
|
2017-01-30 12:47:50 -06:00 |
|
|
mdipierro
|
215abc9e4f
|
download over https for security
|
2017-01-30 12:46:50 -06:00 |
|
|
mdipierro
|
f14c384d83
|
Merge pull request #1558 from abastardi/fix-router
Fix router functions check
|
2017-01-19 09:23:16 -06:00 |
|
|
mdipierro
|
9f186e5d5d
|
Merge pull request #1555 from maxslimmer/master
ccache page fix for disk cache statistics value
|
2017-01-19 09:23:02 -06:00 |
|
|
mdipierro
|
51dd427b9e
|
Merge pull request #1550 from senolakkas/patch-2
fix css validation error
|
2017-01-19 09:22:38 -06:00 |
|
|
mdipierro
|
b2e03c9dee
|
Merge pull request #1540 from ilvalle/fix_ipaddress
Replaced ipaddr with ipaddress.py (backported from py3)
|
2016-12-23 21:58:13 -06:00 |
|
|
mdipierro
|
0644df5283
|
Merge pull request #1549 from amerikan/patch-1
typo fix
|
2016-12-23 21:57:56 -06:00 |
|
|
mdipierro
|
ce0c5f2d5a
|
Merge branch 'master' of github.com:web2py/web2py
|
2016-12-20 15:49:44 -06:00 |
|
|
mdipierro
|
28b0385d9b
|
changes to fabfile
|
2016-12-20 15:49:30 -06:00 |
|
|
mdipierro
|
ac9bccb9a2
|
Merge pull request #1548 from nextghost/languages
Include Auth and Crud messages in language file updates
|
2016-12-20 15:42:38 -06:00 |
|
|
mdipierro
|
aa5b40528f
|
Merge pull request #1546 from wish7code/master
Fix for #1443 - PR will enable emperor.uwsgi.service on boot
|
2016-12-20 15:42:10 -06:00 |
|
|
mdipierro
|
96efc7bfce
|
Merge pull request #1539 from smorrison/master
when mkdir of missing app folders, handle broken links properly
|
2016-12-20 15:40:30 -06:00 |
|
|
mdipierro
|
aa584faed6
|
Merge pull request #1538 from vinyldarkscratch/master
Add web2py componentBegin event
|
2016-12-20 15:39:55 -06:00 |
|
|
mdipierro
|
efff27ffe4
|
improved fabfile
|
2016-12-07 23:02:56 -06:00 |
|
|
mdipierro
|
0b8ecea4dc
|
sudo: required, thanks Leonel
|
2016-11-21 10:27:16 -06:00 |
|
|
mdipierro
|
67945c2d5c
|
Merge pull request #1533 from gchiesa/casv3
implemented base support for CASv3
|
2016-11-21 09:13:41 -06:00 |
|
|
mdipierro
|
c600854f4b
|
Merge pull request #1532 from vinyldarkscratch/translations
Fix T.M() not adding to language files
|
2016-11-21 09:12:42 -06:00 |
|
|
mdipierro
|
ad9ebea900
|
Merge pull request #1531 from vinyldarkscratch/master
Mobile (iOS) flash dismissal fix
|
2016-11-14 08:34:00 -06:00 |
|
|
mdipierro
|
c72330f2cd
|
Merge pull request #1530 from BMarvi/master
Update extract_mysql_models.py
|
2016-11-14 08:33:30 -06:00 |
|
|
mdipierro
|
091d9c74b0
|
Merge pull request #1525 from michele-comitini/confirm_registration_redirect_fix
keep the _next while doing the redirect
|
2016-11-14 08:27:39 -06:00 |
|
|
mdipierro
|
bebdbd9d5e
|
Merge pull request #1519 from matclab/fix/1518
Allow for firstname and lastname in verify_email message
|
2016-11-14 08:27:10 -06:00 |
|
|
mdipierro
|
05e28ddffd
|
Merge pull request #1516 from pixelbandito/grammar-uppercase-lowercase
Corrected use of 'lowercase' and 'uppercase' to fix #1515
|
2016-11-14 08:26:44 -06:00 |
|
|
mdipierro
|
6d38aa7a3d
|
Merge pull request #1507 from vinyldarkscratch/master
Fire event after web2py component completed (Enhancement)
|
2016-10-22 10:14:43 -05:00 |
|
|
mdipierro
|
77dfec9e4d
|
Merge pull request #1504 from vinyldarkscratch/master
Updated and functional version of #1420
|
2016-10-14 10:12:36 -05:00 |
|
|
mdipierro
|
77968b5034
|
Merge pull request #1502 from matclab/issue_1500
Allow cookie to contains several '='
|
2016-10-14 10:12:05 -05:00 |
|
|
mdipierro
|
f9a41875e6
|
Merge pull request #1499 from ilvalle/fix-app-admin
fix few app admin py3 issues, updated qdb (close #1471)
|
2016-10-14 10:11:36 -05:00 |
|
|
mdipierro
|
bc7232456e
|
Merge pull request #1498 from niphlod/fix/1491
fixes #1491
|
2016-10-14 10:10:16 -05:00 |
|
|
mdipierro
|
d15d0e69cc
|
Merge pull request #1497 from niphlod/fix/1489
fixes #1489
|
2016-10-14 10:09:25 -05:00 |
|
|
mdipierro
|
94d449630d
|
Merge pull request #1496 from niphlod/fix/1493
fixes #1493 (at @abastardi's bidding)
|
2016-10-14 10:09:05 -05:00 |
|
|
mdipierro
|
8c252e99cb
|
Merge pull request #1495 from niphlod/fix/appadmin_ccache
fix ccache page in appadmin, thanks MDSIII
|
2016-10-14 10:08:41 -05:00 |
|
|
mdipierro
|
df3524878d
|
Merge pull request #1492 from BuhtigithuB/improve/make-pass-test-tools-py-login-bare
Make pass test_login_bare() and little other improvements
|
2016-10-14 10:08:20 -05:00 |
|
|
mdipierro
|
e6a3081b42
|
Merge pull request #1494 from niphlod/fix/appadmin
fix issue with regex
|
2016-10-07 11:17:45 -05: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 |
|
|
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 |
|
|
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 |
|