dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,412 Commits 18 Branches 72 Tags
d57428e8f0ff19ca7c837dd5c2577e9e5d3cf6fc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mdipierro 1ca0c9b0c0 Merge pull request #1145 from niphlod/fix/1142 
fixes #1142
 2015-12-29 12:07:40 -06:00
mdipierro cee0f91b36 Merge pull request #1144 from niphlod/fix/external_folder 
better support for -f
 2015-12-29 12:06:54 -06:00
mdipierro 71fba07e3a some sqlhtml renaming 2015-12-27 07:12:56 -06:00
mdipierro 2a7a4a3d04 removed print statements 2015-12-27 05:39:08 -06:00
mdipierro 999f235b75 IS_IN_DB(...,delimiter=',',auto_add=True) 2015-12-27 05:33:29 -06:00
mdipierro da22554aed allow for IS_IN_DB(db,db.thing.id,db.thing.name) 2015-12-27 02:46:23 -06:00
mdipierro 0409d6f725 R-2.13.4 2015-12-25 22:56:50 -06:00
mdipierro b6235249da fixed path issue when starting web2py 2015-12-25 22:56:13 -06:00
mdipierro fabadcd21f do not remove gluon/packages/dal/.* files 2015-12-24 09:40:08 -06:00
mdipierro 8e4ea3497b fixed issue #1138, ldap and python 2.6.x problem 2015-12-24 09:15:19 -06:00
mdipierro 4b0e1856b5 reverted 2a245d36 2015-12-24 09:04:45 -06:00
mdipierro 94841c90c3 R-2.13.3 2015-12-24 08:50:24 -06:00
mdipierro f14e5f728c fixing mess 2015-12-24 08:48:19 -06:00
mdipierro 8443c17839 sync'ed appadmins 2015-12-24 08:36:16 -06:00
mdipierro be8114127e Merge pull request #1141 from gi0baro/master 
Tracking latest pyDAL changes
 2015-12-24 08:30:31 -06:00
mdipierro 319a3fc1dc Merge branch 'BuhtigithuB-fix/no-more-deprecated-has-key' 2015-12-23 23:11:55 -06:00
mdipierro 463d643e2c fmerged 2015-12-23 23:11:34 -06:00
mdipierro 0cbed12952 Merge pull request #1137 from cassiobotaro/fix_logging 
fixing logging old behaviour
 2015-12-23 23:08:17 -06:00
mdipierro b5994e57a4 Merge pull request #1136 from cassiobotaro/remove_25_support 
update files removing 2.5 things
 2015-12-23 23:07:54 -06:00
mdipierro 2344386f77 better docstring for Auth.jwt 2015-12-18 19:19:43 -06:00
mdipierro b5e12031c5 added Auth(db,jwt=dict(secret_key='secret')) and auth.allows_jwt() before auth.requires_login() 2015-12-18 19:12:41 -06:00
mdipierro 85e6840cf0 Merge branch 'master' of github.com:web2py/web2py 2015-12-18 18:09:09 -06:00
mdipierro 4c3006acb4 Merge pull request #1135 from gi0baro/master 
Track latest pyDAL GAE fix by @mdipierro
 2015-12-18 18:08:53 -06:00
mdipierro 6bff8af458 CHANGELOG 2015-12-18 04:52:43 -06:00
mdipierro b67edb083e fixed compileapp problem in appveyor test (2nd attempt) 2015-12-18 04:44:03 -06:00
mdipierro 4125a97ce1 fixed compileapp problem in appveyor test 2015-12-18 04:39:51 -06:00
mdipierro 78cf55bf9a R-2.13.2 2015-12-18 04:28:16 -06:00
mdipierro 931daaff89 fixed security issue in reset password when registration_requires_authorization, thanks Giovanni Verde 2015-12-18 04:11:26 -06:00
mdipierro c6550f0adc fixed a condition that allows reset_password if a reset link is sent before a user is blocked 2015-12-18 03:40:12 -06:00
mdipierro 22c89d8dcc version 2.13.1 2015-12-17 21:19:08 -06:00
mdipierro 1636528a0f Merge pull request #1132 from gi0baro/master 
Tracking pyDAL v15.12
 2015-12-17 21:08:30 -06:00
mdipierro acb05dbfe1 added retrieve to fabfile and fixed minor bug 2015-12-15 23:13:46 -06:00
mdipierro fda1117dd7 fixed import 2015-12-14 15:44:34 -06:00
mdipierro d1fde23182 create_user spelling fixed 2015-12-14 15:43:50 -06:00
mdipierro adf4c93860 Merge pull request #1124 from matclab/issue1123 
Convert attachments to a list if necessary.
 2015-12-14 15:32:07 -06:00
mdipierro 02f1903c3d Merge pull request #1127 from gi0baro/appveyor-skip 
Avoid to run pyDAL adapters tests on appveyor
 2015-12-14 15:31:23 -06:00
mdipierro 1137027ecc Merge pull request #1126 from nextghost/master 
Parse GET vars from rewritten query string, not the original. Fixes #730
 2015-12-14 15:31:10 -06:00
mdipierro 229616b9fc added fabfile form deployment and maintenance tasks 2015-12-14 15:16:00 -06:00
mdipierro 483092787b Merge pull request #1120 from dokime7/patch-10 
Fix oauth2 renew token
 2015-12-07 19:58:24 -06:00
mdipierro 30fe7400f9 syncing latest mydal 2015-12-04 15:14:02 -06:00
mdipierro ada9353a7e removed unwanted referene to jwt in tools 2015-12-04 15:10:25 -06:00
mdipierro b0373297e0 Browser auto-fill can corrupt data while using admin database interface #1045, thanks dkleissa 2015-12-04 12:31:35 -06:00
mdipierro 2dbbef724c DIV.elements fails when searching for an attribute with an integer value #1074 2015-12-04 12:21:05 -06:00
mdipierro eb7017fd9a fixed auth.settings.register_onaccept is not firing when signing up through third-party #1081 2015-12-04 12:14:39 -06:00
mdipierro 4c039574df skip failed views, thanks Anthony 2015-12-04 12:06:46 -06:00
mdipierro ab900957fe fixed Cookie parsing stopped after first invalid cookie #1084, thanks paultuckey 2015-12-04 11:44:51 -06:00
mdipierro f960c8f6df fixed add_membership, del_membership, add_membership = IntegrityError (when auth.enable_record_versioning) #1087 2015-12-04 11:42:06 -06:00
mdipierro d2910327c0 temp fix for IS_DATETIME with timezone info & record versioning causes TypeError: can't compare offset-naive and offset-aware datetimes #1094 2015-12-04 11:31:55 -06:00
mdipierro dfd6d52192 fixed missing helper.get(attribute) 2015-12-04 11:28:39 -06:00
mdipierro 7dd8a3c853 fixed Reference to http://..../[app]/default/user/manage_users in welcome's default controller #1102 2015-12-04 11:24:00 -06:00
mdipierro 71ae754fcd fixed #1110, allow passing unicode to template render 2015-12-04 11:16:15 -06:00
mdipierro 0520770a7e fixed #1111, Validator IS_IPV4: options is_private=False not working, thanks Nbushkov 2015-12-04 11:12:44 -06:00
mdipierro 6b880fb455 fixed class concatenation 2015-12-04 10:46:20 -06:00
mdipierro dd180019a1 Merge pull request #1118 from matclab/readonly-label 
Add readonly class to labels of readonly fields and set padding to 0
 2015-12-04 10:43:17 -06:00
mdipierro 638f1f902a Merge pull request #1116 from timnyborg/patch-7 
Fix IS_NOT_IN_DB to work with custom primarykey
 2015-12-04 10:42:25 -06:00
mdipierro 73061e3bf5 Merge pull request #1114 from BuhtigithuB/Improve/ldap-contrib-self-signed-certificate 
Improve/ldap contrib self signed certificate
 2015-12-04 10:42:05 -06:00
mdipierro 5a18e29c2e Merge pull request #1113 from timnyborg/patch-6 
Fix grid count when using groupby on MSSQL
 2015-12-04 10:41:36 -06:00
mdipierro 721af77c90 Merge pull request #1108 from dokime7/patch-9 
Send client_secret when get oauth2 refresh_token
 2015-12-04 10:38:04 -06:00
mdipierro 2cf6797b43 Merge pull request #1106 from erilyth/master 
Added XML to retrieve pickled XML data #1067
 2015-12-04 10:37:50 -06:00
mdipierro 5c4145743f Merge pull request #1103 from ilvalle/w2p_target 
added w2p_target attribute in form to control the output destination
 2015-12-04 10:37:14 -06:00
mdipierro b4733e4617 added gluon/contrib/web2py_jwt.py, thanks Niphlod 2015-12-04 10:30:56 -06:00
mdipierro b51d217d9b french pluralizaiton rules, thanks Mathieu Clabaut 2015-12-04 10:07:38 -06:00
mdipierro db37cf6a58 Revert "Labels should get their information from the render function of the records." 
This reverts commit 65c87386c1.
 2015-11-12 18:25:48 -06:00
mdipierro dba5c97d51 fixed check for form tampering 2015-11-11 18:38:48 -06:00
mdipierro 948bd0c671 fixed check for form tampering 2015-11-11 18:20:37 -06:00
mdipierro 5d8ff8ba2c removed login_once_after_registration 2015-11-11 09:14:05 -06:00
mdipierro 503cd59adc auth.settings.login_once_after_registration 2015-11-11 09:03:54 -06:00
mdipierro a0bcd2287b Merge branch 'josedesoto-issue/1095' 2015-10-30 23:10:35 -05:00
mdipierro 430163f70b fixed conflict 2015-10-30 23:10:25 -05:00
mdipierro 52b59e9b71 Merge pull request #1092 from niphlod/fix/1090 
fixes #1090
 2015-10-30 23:08:47 -05:00
mdipierro e8f87ea274 Merge pull request #1091 from dokime7/patch-8 
Add renew token by using refresh_token
 2015-10-30 23:08:37 -05:00
mdipierro fb6fa0c448 Merge pull request #1088 from niphlod/fix/1083 
fixes #1083
 2015-10-30 23:07:58 -05:00
mdipierro 935c95ccfc Merge pull request #1086 from gi0baro/pydal-tests 
Run pydal's tests inside web2py using contrib adapters
 2015-10-30 23:07:37 -05:00
mdipierro e180e69467 fixed a typo, thanks James Burke 2015-10-30 23:06:00 -05:00
mdipierro e417d311e5 added link to http://www.web2pyref.com/ 2015-10-29 20:59:15 -05:00
mdipierro 199f93f262 fixed typo in tools.py, thanks James Burke 2015-10-29 20:56:40 -05:00
mdipierro 4de007a946 fixed possible problem with cache.action 2015-10-16 21:39:30 -05:00
mdipierro bbed326c20 fixed commit error 2015-10-07 13:15:39 -05:00
mdipierro 874398c38c Merge pull request #1080 from BuhtigithuB/improve/ldap-auth-more-dry 
Make ldap_auth a bit more DRY
 2015-10-07 13:12:30 -05:00
mdipierro a9f8fbadae Merge pull request #1077 from leonelcamara/fix_wiki_extra 
Fixes #721
 2015-10-07 13:08:16 -05:00
mdipierro e62320ff9f Merge pull request #1076 from gi0baro/master 
Tracking pydal 15.09
 2015-10-07 13:07:54 -05:00
mdipierro b3e606295e committed changelog and removed unwanted file 2015-10-07 13:04:12 -05:00
mdipierro b8c2bd7303 fixed LazyCrypt and fixed git problem 2015-10-07 13:02:30 -05:00
mdipierro 1387b26606 fixed LazyCrypt, thanks Denes 2015-10-07 12:57:20 -05:00
mdipierro 2c57dc084e Merge pull request #1073 from niphlod/fix/1043 
fixes #1043 , thanks @bobstjon
 2015-09-27 14:40:27 -05:00
mdipierro c17ba0a020 Merge pull request #1072 from niphlod/fix/1039 
fixes #1039
 2015-09-27 14:40:14 -05:00
mdipierro 7d4b460e1b Merge pull request #1071 from niphlod/fix/1068 
fixes #1068
 2015-09-27 14:39:58 -05:00
mdipierro 6680ea8ab7 Merge pull request #1061 from nklever/master 
small changes in sqlhtml.py, validator.py, contrib/spreadsheet.py
 2015-09-27 14:39:47 -05:00
mdipierro 0fa0dbaeea Merge branch 'master' of github.com:web2py/web2py 2015-09-20 14:07:06 -05:00
mdipierro b47511c896 token default = web2py_uuid 2015-09-20 14:07:01 -05:00
mdipierro e31318eaa8 Merge pull request #1066 from lraphael/master 
fix unindented lines
 2015-09-18 00:41:34 -05:00
mdipierro 72ee538883 Merge pull request #1065 from leonelcamara/pa_integration 
PythonAnywhere integration
 2015-09-18 00:41:20 -05:00
mdipierro b6ddc6098e Merge pull request #1060 from viniciusban/1059-response-render-uses-original-response-view 
Closes #1059: get `response.view` from the environment
 2015-09-18 00:40:04 -05:00
mdipierro 90854eae44 Merge pull request #1058 from niphlod/fix/735 
fixes issue #735
 2015-09-18 00:39:08 -05:00
mdipierro 2bceb3f95f Merge pull request #1057 from niphlod/fix/823 
fixes #823
 2015-09-18 00:38:55 -05:00
mdipierro 9da1e29014 Merge pull request #1056 from niphlod/fix/wiki_typo 
fixes typo in wiki.
 2015-09-18 00:38:38 -05:00
mdipierro d4270373e1 fixed bug in redirect to cas service, thanks Fernando González 2015-09-01 23:07:18 -05:00
mdipierro e4b27080ca Merge pull request #1051 from ShySec/master 
added HttpOnly cookies (default)
 2015-08-30 20:41:23 -05:00
mdipierro 692791a518 Merge pull request #1053 from BuhtigithuB/feature/redirect-next-var-when-logged-on-page-reload 
No credentials request if logged in and URL contains user/login?_next=
 2015-08-30 00:58:27 -05:00
mdipierro 9190191c7a changed the default BS3 theme 2015-08-23 10:07:32 -05:00