Commit Graph

6916 Commits

Author SHA1 Message Date
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
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
ilvalle
73399fdee6 fix py3 html 2016-07-15 20:35:54 +02:00
ilvalle
f9927f4f3d fix local import for contrib modules 2016-07-15 20:34:27 +02: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
Richard Vézina
bd47b7f80a .att() -> .prop() for setting autocomplete off 2016-07-10 12:30:22 -04: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
ilvalle
967b2e27a7 added global_settings.is_py2 2016-07-06 17:25:26 +02:00
ilvalle
5e94c11e40 Enabled py35 on appveyor 2016-07-06 17:25:22 +02: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
ilvalle
61c9b7991e py35 fix cacheOnDisk on win 2016-07-04 20:30:50 +02:00
mdipierro
b5ea78e5d6 Merge pull request #1385 from jnbrex/master
Changed tuple to list
2016-07-02 01:04:04 -05:00
Jason Bohrer
0c4d254a9c Changed tuple to list
The comparison between parts[1:3] and ('', host) would return false because a list and a tuple were being compared.
2016-07-01 13:26:23 -04: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