dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,834 Commits 18 Branches 72 Tags
0dbd2ea6e5d3fec68608facbcecd065c907e9bb0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mdipierro 67485d16a5 R-2.14.4 2016-04-12 16:21:05 -05:00
mdipierro eba8ad4b55 fixed CHANGELOG 2016-04-12 15:45:54 -05:00
mdipierro 4ed6fb7ed9 Merge pull request #1288 from carpaIdea/patch-1 
Missing <!DOCTYPE html>
 2016-04-12 15:44:19 -05:00
mdipierro 70f793b422 Merge pull request #1287 from leonelcamara/test_week6 
Test week6
 2016-04-12 11:14:14 -05:00
mdipierro 5ca65d55d2 Merge pull request #1284 from BuhtigithuB/more-markmin-pep8 
More markmin pep8
 2016-04-11 13:38:54 -05:00
mdipierro 3f200fdc22 Merge pull request #1283 from leonelcamara/grid_issues 
closes #1188
 2016-04-11 13:38:37 -05:00
mdipierro 8ef04ac425 Merge pull request #1282 from BuhtigithuB/Feature/heading-anchor 
Feature/heading anchor
 2016-04-09 18:39:39 -05:00
mdipierro 83cf098c07 fixed stupid.css and impersonate 2016-04-09 10:30:31 -05:00
mdipierro 70b41fa15e Merge pull request #1280 from BuhtigithuB/pep8-gluon-html-py 
Enhance gluon/html.py PEP8
 2016-04-08 23:37:54 -05:00
mdipierro 56af81f247 Merge pull request #1278 from BuhtigithuB/pep8-welcome 
Pep8 welcome
 2016-04-08 23:37:32 -05:00
mdipierro 7fd30d8360 Merge pull request #1276 from BuhtigithuB/Improve/web2py-com-display 
Improve/web2py com display
 2016-04-08 23:35:43 -05:00
mdipierro e1aefa2307 Merge pull request #1275 from BuhtigithuB/Improve/gluon-tools-py 
PEP8 Recaptcha/2 docstring
 2016-04-08 23:35:10 -05:00
mdipierro 7a2316ec9a Merge pull request #1260 from BuhtigithuB/add-test-sqlform 
SQLFORM() basic check
 2016-04-08 23:34:51 -05:00
mdipierro 99a323c7ad Merge pull request #1272 from BuhtigithuB/new-logout-bare 
New logout_bare() for shell logout and refactor test using it
 2016-04-07 09:17:19 -05:00
mdipierro ff0d10ac4f Merge pull request #1271 from leonelcamara/delete_unused_reserved 
delete unused reserved_sql_keywords.py because the DAL uses this one …
 2016-04-06 20:58:05 -05:00
mdipierro eee7be75c8 Merge pull request #1265 from BuhtigithuB/improve-tools-tests-some-more 
Improve tools tests some more
 2016-04-06 20:57:30 -05:00
mdipierro 3c69716672 Merge pull request #1270 from leonelcamara/test_week5b 
Test Mail.Attachment sending test_tools.py itself
 2016-04-06 20:57:06 -05:00
mdipierro 4d1a4c48e6 Merge pull request #1268 from mbelletti/fix/cas_login 
Fix #1267 cas_login
 2016-04-06 13:49:28 -05:00
mdipierro 40f04de9d2 fixed scripts/setup-web2py-nginx-uwsgi-ubuntu.sh 2016-04-06 09:20:13 -05:00
mdipierro 52615fbca7 Merge pull request #1263 from niphlod/tests/scheduler 
initial tests for scheduler.py, plus a minor fix for JobGraph
 2016-04-05 17:00:00 -05:00
mdipierro 0804c28331 Merge pull request #1259 from BuhtigithuB/new-test-sqlform 
let start testing sqlhtml.py
 2016-04-02 15:02:02 -05:00
mdipierro 24bc51447c Merge pull request #1257 from BuhtigithuB/improve-tools-tests 
Improve tools tests
 2016-04-02 15:00:41 -05:00
mdipierro ccbbdc2493 Merge branch 'leonelcamara-prettier_examples' 2016-04-02 14:59:23 -05:00
mdipierro d94e8415c7 reverted stupid 2016-04-02 14:57:36 -05:00
mdipierro 0a62e86156 Merge pull request #1254 from leonelcamara/test_week4b 
Seriously increase template.py coverage
 2016-04-02 14:53:39 -05:00
mdipierro 5744c06f59 Merge pull request #1253 from leonelcamara/test_week4 
More test coverage for validators.py
 2016-04-02 14:52:42 -05:00
mdipierro 947f92774b Merge pull request #1252 from BuhtigithuB/improve-test-chache 
Improve test chache
 2016-04-02 14:52:26 -05:00
mdipierro 46ffaa6aea improved search form 2016-04-02 14:48:03 -05:00
mdipierro ba2be80080 updated stupic.css and suport page 2016-04-02 14:35:28 -05:00
mdipierro a0bbd7885a Merge branch 'master' of github.com:web2py/web2py 2016-03-26 17:56:23 -05:00
mdipierro c2ce90a1fe R-2.14.3 2016-03-26 17:55:52 -05:00
mdipierro 197b018534 fixed stupid.css again 2016-03-26 17:54:11 -05:00
mdipierro 060aeff867 Merge pull request #1251 from BuhtigithuB/add-even-more-test-over-html-py 
More coverage and some PEP8 enhencement to html.py
 2016-03-26 00:00:43 -05:00
mdipierro d4572c5f38 Merge branch 'master' of github.com:web2py/web2py 2016-03-25 23:57:24 -05:00
mdipierro 46dc83a1bb synced to latest stupid.css 2016-03-25 23:57:13 -05:00