dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,210 Commits 18 Branches 72 Tags
3e8cbd5a0d8d3f47af36cdfd38ce511adc1ad546
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mdipierro 2d866647e2 Merge pull request #1017 from raj454raj/master 
Small typo
 2015-07-07 03:55:17 -05:00
mdipierro ee2879442f tracking last master since that works better at this time 2015-07-06 10:13:47 -05:00
mdipierro ad68d2415d possibly fixed issue #243, SQLFORM.factory(..) and DAL(None) 2015-07-06 10:04:14 -05:00
mdipierro 928de67f8d fixed DAL(None) 2015-07-06 10:01:40 -05:00
mdipierro 68296f9e65 Merge pull request #1016 from ShySec/master 
fix Field.Virtual use in multi-table queries
 2015-07-06 07:44:49 -05:00
mdipierro 1fc90fdb6d scripts/web2py-scheduler.conf 2015-07-06 04:46:56 -05:00
mdipierro 34a9d72cde mail.settings.server='logging:filename' 2015-07-06 04:45:14 -05:00
mdipierro 198ce939d0 fixed css of population table 2015-07-04 17:12:25 -05:00
mdipierro e31a099cb3 Merge pull request #1012 from ortgit/master 
Security fix: Validate for open redirect everywhere, not just in login()
 2015-07-02 06:40:12 -05:00
mdipierro cc7e10d216 Merge pull request #1009 from rserbitar/master 
Fix compatibility with Tornado 4
 2015-07-02 06:38:35 -05:00
mdipierro d8b68036c2 Merge pull request #1006 from kjkuan/workaround-urllib-bug 
Workaround http://bugs.python.org/issue9405 on OS X.
 2015-07-02 06:38:18 -05:00
mdipierro d6146c9c5d no more text shadow in buttons, was horrible 2015-07-01 12:18:10 -05:00
mdipierro b3be806244 Merge pull request #1008 from leonelcamara/pack_exe 
Moved pack as exe functionality to the pack_custom.html form
 2015-07-01 09:01:49 -05:00
mdipierro 2fc081bc3c no more module_installer 2015-06-30 16:12:54 -05:00
mdipierro 8e63825def Merge pull request #1007 from leonelcamara/pack_exe 
Allow packing an application with the windows executable
 2015-06-30 12:32:05 -05:00
mdipierro 61e33da844 module installer 2015-06-30 11:14:47 -05:00
mdipierro 7543c54bdb enable_tokens in welcome 2015-06-30 02:32:44 -05:00
mdipierro 00608e4f04 auth.settings.enable_tokens and header web2py_user_token 2015-06-29 13:38:54 -05:00
mdipierro cdbf48f09b fixed margin-top in welcome 2015-06-29 13:03:23 -05:00
mdipierro f39db6331a dealing with issue of accidentally redefining request/response, thanks Auden RovelleQuartz 2015-06-29 03:56:22 -05:00
mdipierro ef433da190 improvements to token logic, thanks Niphlod 2015-06-28 17:01:21 -05:00
mdipierro d2375b4187 always allow access to <app>/appadmin/manage/auth if used is admin 2015-06-28 16:41:09 -05:00
mdipierro 26d87967c5 always allow access to appadmin/manage.auth if used is admin 2015-06-28 16:40:23 -05:00
mdipierro 044b2331c3 bulk_register_enabled=False 2015-06-28 10:30:05 -05:00
mdipierro c89614ada6 more strict conditions on bulk_register 2015-06-28 10:20:33 -05:00
mdipierro f0aba167b4 _token, not token 2015-06-28 09:51:45 -05:00
mdipierro bde9562b78 api_tokens in example 2015-06-28 09:49:50 -05:00
mdipierro 9a1229470a support for api_tokens 2015-06-28 09:48:08 -05:00
mdipierro f781b9e1f5 Merge branch 'peregrinius-master' 2015-06-28 09:08:54 -05:00
mdipierro fa32b7577b fixed a bug and added support for user/bulk_register 2015-06-28 09:01:10 -05:00
mdipierro 68526a0c6d allow unsorted multiword query in grid search 2015-06-28 07:52:34 -05:00
mdipierro ad2003c618 fixed recently introduced sanitize bug 2015-06-27 00:33:16 -05:00
mdipierro c1ecf823d8 added link to new tutorial 2015-06-26 08:07:31 -05:00
mdipierro 6134f82452 fixed issuer #239, locking error on FreeBSD, thanks josejachuf 2015-06-26 06:58:07 -05:00
mdipierro fbb5a8b9bb fixed issue #968, IS_MATCH validator bug with unicode, thanks alex0834 2015-06-25 04:36:16 -05:00
mdipierro df34869d65 fixes #978, autotypes and unicode strings, thanks remcoboerma 2015-06-25 04:31:41 -05:00
mdipierro 28e6999e7d fixed issue #980, Admin application: can't access directories with space in directory name, thanks mmihaltz 2015-06-25 04:30:10 -05:00
mdipierro f4f77b0cb6 fixed issue #982, LOAD with ajax=False and args 2015-06-25 04:23:49 -05:00
mdipierro 23ddb6c3c2 fixed issue #999, gluon.sanitiizer.sanitze improvement, thanks macfiron 2015-06-25 04:19:01 -05:00
mdipierro b636a5d6e9 more companies 2015-06-25 03:26:18 -05:00
mdipierro efc392966e Merge pull request #1005 from cs09g/patch-3 
change misspelling
 2015-06-18 06:31:51 -05:00
mdipierro cffa59a80c Merge pull request #1004 from cs09g/patch-2 
simplified conditions
 2015-06-18 06:31:22 -05:00
mdipierro 82a1b9f628 Merge pull request #1003 from cs09g/patch-1 
remove duplicated execution
 2015-06-18 06:31:08 -05:00
mdipierro 94d2f1453d Merge pull request #1002 from cs09g/patch-5 
change initialization
 2015-06-18 06:30:30 -05:00
mdipierro a1875ee362 Merge pull request #1001 from cs09g/patch-3 
Update appadmin.py
 2015-06-18 06:29:57 -05:00
mdipierro 5f13dca712 Merge pull request #1000 from niphlod/fix/readme 
after appveyor hooks have been defined...
 2015-06-18 06:28:39 -05:00
mdipierro 97489fd277 Merge pull request #998 from niphlod/build/appveyor 
move to codecov and enable appveyor too
 2015-06-17 02:00:48 -05:00
mdipierro b86184fe58 Merge pull request #997 from niphlod/fix/bs3_grid_checkbox 
fix display of checkboxes in search form of grid
 2015-06-17 02:00:34 -05:00
mdipierro 73e176365f Merge pull request #995 from niphlod/fix/994 
fixes #994
 2015-06-07 21:47:28 -05:00
mdipierro 33f12d91a5 Merge pull request #992 from btreecat/master 
Fixed authentication using different login methods.
 2015-06-07 21:47:08 -05:00
mdipierro d0f1286f03 Merge pull request #991 from cs09g/patch-2 
Update appadmin.py
 2015-06-07 21:44:44 -05:00
mdipierro 04d698109e Merge pull request #990 from cs09g/patch-1 
remove invalid initialize
 2015-06-07 21:44:19 -05:00
mdipierro 0e9c5caf4d added request_reset_password_on... 2015-06-07 21:28:18 -05:00
mdipierro 236fdcfafc R-2.11.2 2015-05-30 11:30:16 -05:00
mdipierro ce0f83d00c Merge pull request #988 from gi0baro/master 
Track pyDAL 15.05.29
 2015-05-30 11:29:09 -05:00
mdipierro 01474c99b0 R-2.11.1 2015-05-28 23:22:16 -05:00
mdipierro 66d15491ca Merge pull request #984 from ilvalle/minorfix 
lazy request.uuid
 2015-05-28 23:17:21 -05:00
mdipierro 376a27da73 Merge pull request #983 from Euphorbium/patch-1 
fix cPickle not defined error
 2015-05-28 23:16:33 -05:00
mdipierro 0f95c13dc7 Merge pull request #981 from gi0baro/master 
Track pyDAL 15.05.26
 2015-05-28 23:16:02 -05:00
mdipierro 926de90ee4 fixed bug in orderby when it is a list 2015-05-28 13:59:03 -05:00
mdipierro 1e66fa3a93 new version number 2015-05-24 19:14:49 -05:00
mdipierro 57a8dfe034 Merge pull request #977 from austinprog/patch-1 
Changed "Import about this GIT repo" Line 16, typo
 2015-05-24 18:58:22 -05:00
mdipierro 77e7631740 Merge pull request #976 from niphlod/fix/ubuntu_nginx_hardening 
thanks  @wmunguiam for spotting
 2015-05-24 18:57:51 -05:00
mdipierro ba978d55cf Merge pull request #975 from gi0baro/master 
Track pyDAL 15.05
 2015-05-24 18:57:36 -05:00
mdipierro 12e8ee5c25 Merge pull request #974 from niphlod/fix/redis_cache_multiapp 
redis multi-app. Thanks Lisandro for spotting it
 2015-05-24 18:57:26 -05:00
mdipierro c7d3758c77 Merge pull request #973 from omniavx/patch-1 
Update dal.py
 2015-05-20 08:27:41 -05:00
mdipierro 040e52278e Merge pull request #956 from cassiobotaro/master 
More changes in List (request.args)
 2015-05-20 08:27:16 -05:00
mdipierro 3daf953c66 syncing maintenance again 2015-05-20 08:26:03 -05:00
mdipierro de3d722ac9 fixed import, thanks Auden RovelleQuartz 2015-05-20 08:24:33 -05:00
mdipierro eb4d159b37 fixed process_batch_upload 2015-05-18 23:28:17 -05:00
mdipierro 76cfba7047 Merge pull request #964 from matclab/mail-send-lazy-to-unicode 
#963 : Convert subject and body to unicode before sending mail
 2015-05-14 09:17:04 -05:00
mdipierro f77f307869 Merge pull request #970 from ailnlv/patch-1 
Fixing https://github.com/web2py/web2py/issues/969
 2015-05-14 09:16:52 -05:00
mdipierro 5ef8648929 Merge pull request #967 from bletourmy/fix/966 
fixes #966 - deadlock in cache.disk
 2015-05-14 09:16:31 -05:00
mdipierro ed042685ea Merge pull request #965 from niphlod/fix/962 
fixes #962
 2015-05-14 09:16:10 -05:00
mdipierro d09ce57f12 Merge pull request #961 from niphlod/fix/628 
fixes #628
 2015-05-14 09:14:06 -05:00
mdipierro 587ff56a94 linked 15.03-maintenance again 2015-05-07 22:26:42 -05:00
mdipierro 6f91fdd833 minor refactoring in grid(orderby) 2015-05-06 08:56:56 -05:00
mdipierro 6e2f9ad043 fixed examples support 2015-05-04 11:23:44 -05:00
mdipierro f45bf73992 Merge branch 'master' of github.com:web2py/web2py 2015-05-03 16:42:42 -05:00
mdipierro 94461724f6 Merge pull request #954 from cassiobotaro/master 
Mantain backward compatibility
 2015-05-03 16:42:12 -05:00
mdipierro 99fb1c3010 Merge branch 'master' of github.com:web2py/web2py 2015-05-03 10:31:37 -05:00
mdipierro 20067d7b93 Merge pull request #953 from niphlod/fix/691 
fixes issue #691
 2015-05-03 10:31:32 -05:00
mdipierro 44eb35c617 Merge pull request #952 from niphlod/fix/734 
fixes #734
 2015-05-03 10:31:21 -05:00
mdipierro df03317054 Merge pull request #951 from niphlod/tests/cache_ram_and_disk 
more tests, general cleanup
 2015-05-03 10:31:08 -05:00
mdipierro 9d873cbd1c reverted last commit 2015-05-03 10:30:43 -05:00
mdipierro 1bb4117cbd Merge pull request #950 from cassiobotaro/master 
Fix List behaviour and added new feature
 2015-05-03 10:27:46 -05:00
mdipierro e834186a86 Merge pull request #950 from cassiobotaro/master 
Fix List behaviour and added new feature
 2015-05-03 10:23:08 -05:00
mdipierro 1394942feb removed reference to python 2.5 2015-05-03 10:09:07 -05:00
mdipierro 9b12459a82 Merge branch 'master' of github.com:web2py/web2py 2015-05-02 23:16:12 -05:00
mdipierro 8e3925820c allow disabling of confirmation in js delete 2015-05-02 23:16:05 -05:00
mdipierro 279d71d4cd Merge pull request #936 from niphlod/enhancement/919 
added newer Recaptcha2 class to deal with v2.0. Fixes #919
 2015-05-02 23:07:36 -05:00
mdipierro 54b385b321 grid(user_cursor=False) by default because it is broken 2015-04-26 17:16:19 -05:00
mdipierro df039e734c 2.10.4 stable 2015-04-26 10:10:18 -05:00
mdipierro 58533954dc R-2.10.4 2015-04-26 09:07:07 -05:00
mdipierro 236dc4b943 fixed submodule tracking 2015-04-26 09:04:55 -05:00
mdipierro 6612fd1cfe told git to track the right submodule branch 2015-04-26 08:50:16 -05:00
mdipierro 520950ba74 track track 15.03-maintenance (19/04/15) 2015-04-26 08:44:45 -05:00
mdipierro e943aa9c25 minor compatibility fix in ldap_auth 2015-04-26 08:39:47 -05:00
mdipierro 756aec7206 Merge pull request #944 from stephenrauch/ldap_auth-fix-nosql 
Fix ldap_auth for NoSQL databases
 2015-04-26 08:29:26 -05:00
mdipierro 970e2ed35c Merge pull request #939 from smorrison/slack_webhook_support 
add support for reporting web2py errors via slack.com
 2015-04-26 08:29:00 -05:00