reverted latest commit, Leonel is right, better to use closures
template converter for alternative delimiters
template converter for alternative delimiters
syncing
Merge branch 'master' of github.com:web2py/web2py into HEAD
Changed a condition in order to not show `None` if there is not error
Merge branch 'master' of github.com:web2py/web2py into HEAD
Option to limit inline display of linked tables

Added a new option to smartgrid: "max_linked_inline".
When set to a value greater than zero, it will limit the inline display of linked tables (in grid, edit and details).
In case there are a number of linked tables greater than the setting, the links will be displayed in a select list menu.
Merge pull request #475 from omartrinidad/master

Changed a condition in order to not show `None` if there is no errors
Merge pull request #478 from alexdba/master

Option to limit inline display of linked tables
not sure what happened but fixing local commit
Merge remote-tracking branch 'origin/master'
merging latest online fixes after local brach fix
Fixed issue 1954, re-raising exceptions the right way, thanks Marton
Fixed issue 1962, postgres INSERT ... RETURING id, thanks perakojotgenije
fixed 1961, redirect(..,headers=request.headers), thanks remco.boerma
request.is_shell and request.is_scheduler
fixed redirection bug
fixed postgresql bug introduced in recent commit?
fixed issue 1950, allow change password for any old password complexity