dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,900 Commits 18 Branches 72 Tags
3bc6769e287ef282fe6a3a3be6b8d83bb3eb3104
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mdipierro dabe5c4589 Merge pull request #1368 from ilvalle/py3_fixes4 
Py3 fixes4
 2016-06-22 16:38:59 -05:00
mdipierro 1da93676a2 Merge pull request #1367 from ilvalle/py3_fixes_step3 
Updated user_agent_parser
 2016-06-19 14:15:58 -05:00
mdipierro 0dbd2ea6e5 added quote_template 2016-06-18 10:46:46 -05:00
mdipierro e33dd01516 DAL v16.06.09 2016-06-18 08:50:56 -05:00
mdipierro 45a376eee9 added extra_mssql_models.py, thanks Kyle Flanagan 2016-06-18 08:12:01 -05:00
mdipierro ce3f5fbff2 Merge pull request #1365 from niphlod/feature/scheduler_crontab 
repeats via cronline expression
 2016-06-18 07:49:08 -05:00
mdipierro 338ca6ba5c Merge pull request #1361 from ilvalle/py3_fixes_step2 
few py3 fixes
 2016-06-18 07:48:39 -05:00
mdipierro ce3e314360 Merge pull request #1360 from ilvalle/master 
fix request.json, close #1337
 2016-06-18 07:48:14 -05:00
mdipierro a18e0e489f why is session.forget not callable in tests? 2016-06-12 21:08:33 -05:00
mdipierro dfb0129f09 do not forget a missing session 2016-06-12 20:55:16 -05:00
mdipierro cadb130518 fixed expose tests 2016-06-12 20:27:20 -05:00
mdipierro a830f95f70 Merge branch 'ilvalle-py3_fixes' 2016-06-12 20:00:10 -05:00
mdipierro f4a353960b merged conflicts 2016-06-12 19:59:58 -05:00
mdipierro c5bafa16dd Merge pull request #1357 from chenl/master 
fix issue#1261: security issue: gluon.tools.Expose will follow symlinks
 2016-06-12 19:56:40 -05:00
mdipierro 15a26c00b1 Merge pull request #1352 from zvolsky/_revert_wiki 
revert wiki to earlier (properly working) state
 2016-06-07 20:36:52 -05:00
mdipierro df9928d69c Merge pull request #1349 from zvolsky/_represent_none 
represent none
 2016-06-07 20:36:01 -05:00
mdipierro 154073c3a6 Merge pull request #1341 from nextghost/master 
Ignore internal attributes when checking whether new session was changed
 2016-06-03 10:04:00 -05:00
mdipierro 14ac911ce7 Merge pull request #1344 from michele-comitini/jwt-renew-fix 
Jwt renew fix
 2016-06-03 10:02:41 -05:00
mdipierro 1554a29f5f Merge pull request #1345 from niphlod/fix/codecov 
should turn off the codecov/changes report
 2016-06-03 10:02:09 -05:00
mdipierro cbd8c63b26 Merge pull request #1335 from zvolsky/_breadcrumb_divider 
better breadcrumb divider for smartgrid
 2016-05-23 22:20:57 -05:00
mdipierro fec756213d Merge pull request #1336 from cccaballero/master 
fixing dictionary changed size error on SQLFORM using extra_fields
 2016-05-23 22:19:29 -05:00
mdipierro d1889b922b Merge pull request #1333 from leonelcamara/versionchecks 
Removed unnecessary version checks
 2016-05-19 18:49:55 -05:00
mdipierro 56b29553c5 Merge pull request #1330 from oscarfonts/catalan-plurals 
Added catalan plural rules
 2016-05-14 10:16:39 -05:00
mdipierro 8679ab1777 Merge pull request #1329 from leonelcamara/test_week11 
more tests for languages module
 2016-05-14 10:16:21 -05:00
mdipierro 73713f2e45 Merge pull request #1328 from niphlod/settings/codecov 
added codecov setting file
 2016-05-14 10:16:12 -05:00
mdipierro be1845ad83 Merge pull request #1327 from leonelcamara/ditch26 
Ditch python2.6
 2016-05-11 01:35:52 -05:00
mdipierro 5246d808f0 Merge pull request #1326 from michele-comitini/jwt-decorator-fix 
make allows_jwt a real decorator. Tests included!
 2016-05-11 01:35:44 -05:00
mdipierro 32ac20c1c5 Merge pull request #1325 from gi0baro/issue-1324 
Fix #1324
 2016-05-11 01:35:30 -05:00
mdipierro cda35fd48a R-2.14.6 2016-05-09 19:19:07 -05:00
mdipierro 85c37af1f4 removed unwanted file 2016-05-09 19:11:08 -05:00
mdipierro 87935a45ba Merge branch 'master' of github.com:web2py/web2py 2016-05-09 00:24:29 -05:00
mdipierro 0692272991 going back to dal 16.03 to prepare for 2.14.6 2016-05-09 00:24:14 -05:00
mdipierro c9f11c068c Merge pull request #1322 from ShySec/oneall_optimization 
simplified oneall dname handling
 2016-05-09 00:05:06 -05:00
mdipierro 54b0feeffb Merge pull request #1321 from ShySec/master 
fixed timing attack in gluon.utils.compare
 2016-05-09 00:04:39 -05:00
mdipierro 8666f993d1 Merge pull request #1320 from niphlod/enhancement/redis_scheduler 
sync with main scheduler
 2016-05-09 00:03:42 -05:00
mdipierro 82d79e74c6 Merge pull request #1318 from leonelcamara/admin_lockout 
Check if host is denied before verifying password
 2016-05-04 13:30:14 -05:00
mdipierro 33c1144e2e fixing merge issue 2016-05-04 09:29:30 -05:00
mdipierro ca21bb0b9a added contributor Narendra Bhati(security) 2016-05-04 09:28:25 -05:00
mdipierro a2b98cd6df Merge pull request #1317 from leonelcamara/test_week9 
more tests for validators
 2016-05-04 09:25:30 -05:00
mdipierro 51c3b633fe remove XSS attack in installing plugin, thanks Nerendra Bhati 2016-05-04 09:21:20 -05:00
mdipierro 1e74c332d0 Merge branch 'master' of github.com:web2py/web2py 2016-05-04 09:12:52 -05:00
mdipierro 4bd002aee9 fixed CSRF in admin enabled/disable. thanks Nerendra Bhati 2016-05-04 09:11:55 -05:00
mdipierro af18582198 Merge pull request #1315 from niphlod/enhancement/scheduler 
can now process tasks with huge_results
 2016-05-02 10:16:38 -05:00
mdipierro 2d6ca49675 Merge pull request #1314 from chenl/issue_1310 
issue#1310
 2016-05-02 10:16:03 -05:00
mdipierro db36e4380d Merge pull request #1308 from leonelcamara/test_week8 
partial tests for appadmin, testing a bunch of other stuff in the pro…
 2016-05-02 10:13:54 -05:00
mdipierro 2fc1378399 Merge pull request #1307 from zvolsky/master 
script for language files update has new param to update existing tra…
 2016-04-25 20:32:24 -05:00
mdipierro 8ed6736e82 Merge pull request #1306 from BuhtigithuB/improve/html-and-it-tests 
improve html.py, new url_encode=True/False test, review/close #1279
 2016-04-24 18:44:38 -05:00
mdipierro 99b083ad43 Merge pull request #1305 from leonelcamara/test_week7 
100% coverage for recfile
 2016-04-24 18:43:31 -05:00
mdipierro 735d79c211 latest pydal fixed connection issue 2016-04-19 22:45:49 -05:00
mdipierro 4177b4fe58 included fixes from dal 2016-04-19 11:42:24 -05:00
mdipierro 82aec9ba39 new fixes from Giovanni 2016-04-19 11:30:40 -05:00
mdipierro 0a633236e5 pydal fixes, thanks Giovanni 2016-04-19 08:17:55 -05:00
mdipierro 42d1544478 new experimental dal 2016-04-18 21:28:27 -05:00
mdipierro 85819a5f83 Merge pull request #1299 from BuhtigithuB/improve/auth-tests 
New Auth tests
 2016-04-17 21:27:35 -05:00
mdipierro 9ca1c28db3 Merge pull request #1298 from BuhtigithuB/new/prettydate-test-suite 
New test suite for prettydate() + fix wrong number of days for month
 2016-04-17 21:27:18 -05:00
mdipierro 2a2771c4cc Merge pull request #1297 from BuhtigithuB/update/markdown2-contrib 
Update markdown2.py 2.2.4 -> 2.3.1 (latest release)
 2016-04-15 22:10:22 -05:00
mdipierro 4fbd612d1b Merge pull request #1296 from BuhtigithuB/enhancement/pep8-tools-py 
Enhancement tools.py PEP8
 2016-04-15 22:10:12 -05:00
mdipierro 190c77e0e7 Merge pull request #1295 from BuhtigithuB/refactor/auth-tools-tests 
Refactor Auth tests, new test, old implementation commented for now
 2016-04-15 22:09:44 -05:00
mdipierro 81d0291ce2 R-2.14.5 2016-04-13 22:22:39 -05:00
mdipierro 894ff3c140 Merge pull request #1294 from leonelcamara/fix_1274 
fixes #1274
 2016-04-13 22:16:46 -05:00
mdipierro 216ce5507c Merge pull request #1293 from leonelcamara/fix_1266 
fixes #1266 and adds tests to make sure it doesn't happen again
 2016-04-13 22:15:53 -05:00
mdipierro 068aecff93 Merge pull request #1292 from BuhtigithuB/add-more-html-test 
Some more coverage for XML() and DIV()
 2016-04-13 22:15:22 -05:00
mdipierro 8c5858b6b7 fixed merge issue 2016-04-13 08:41:09 -05:00
mdipierro 6400e28a85 fixed stupid 2016-04-13 08:40:19 -05:00
mdipierro 3e46d50aa1 Merge pull request #1290 from carpaIdea/patch-3 
box-sizing best practice
 2016-04-13 08:33:29 -05:00
mdipierro cb94fde80b Merge pull request #1289 from carpaIdea/patch-2 
<main> semantic element IE fix
 2016-04-13 08:30:20 -05:00
mdipierro 98593eefce Merge pull request #1291 from leonelcamara/test_week6 
Test emails with alternative text and html
 2016-04-13 08:27:33 -05:00