ab84c95179
fixed 1961, redirect(..,headers=request.headers), thanks remco.boerma
2014-08-07 23:48:42 -05:00
6db3b0621c
Fixed issue 1962, postgres INSERT ... RETURING id, thanks perakojotgenije
2014-08-07 23:43:22 -05:00
a858f811a1
Fixed issue 1954, re-raising exceptions the right way, thanks Marton
2014-08-07 23:33:34 -05:00
309a7c39ca
merging latest online fixes after local brach fix
2014-08-06 14:52:10 -05:00
d4e71073d7
Merge remote-tracking branch 'origin/master'
2014-08-06 14:50:53 -05:00
63529e5ad8
not sure what happened but fixing local commit
2014-08-06 14:50:51 -05:00
d1118b606b
Merge pull request #478 from alexdba/master
...
Option to limit inline display of linked tables
2014-08-06 14:45:23 -05:00
8f649f1820
Merge pull request #475 from omartrinidad/master
...
Changed a condition in order to not show `None` if there is no errors
2014-08-06 14:44:13 -05:00
8ef66bb0f4
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.
2014-08-05 15:20:01 -03:00
59bbe7cddd
minor - removed unnecessary dict calls
2014-08-05 18:32:32 +01:00
c9c054e72b
refactored backward compatibility on formstyles to use try except instead of inspecting arguments, should make the new style faster as it never raises the exception
2014-08-05 18:30:20 +01:00
0f55d43a11
Removed unecessary dict call in get_workers
2014-08-05 15:37:10 +01:00
ba82c0d86b
Merge branch 'master' of git://github.com/web2py/web2py
2014-08-05 15:35:18 +01:00
5c0693b175
Further refactored SQLiteAdapter calling the super method instead of duplicating the code
2014-08-05 10:53:40 +01:00
24c0c3d129
Merge branch 'master' of github.com:web2py/web2py into HEAD
2014-08-05 01:44:20 -05:00
3dec218ff0
Merge pull request #477 from niphlod/enhancement/scheduler_deps
...
new feature (task dependencies) and a little bit of refactoring
2014-08-05 01:44:11 -05:00
cb6f2ca302
task dependencies, a little bit of refactoring
2014-08-04 21:42:11 +02:00
b788e8b493
minor - Slight optimization use tablename directly instead of table._tablename
2014-08-02 10:57:02 +01:00
444a09b0b2
Refactored BaseAdapter delete method - Special case code for sqlite and spatialite should not be in the BaseAdapter it should be in SQLiteAdapter, this should also provide a negligible performance boost in delete operations for most adapters including SQLiteAdapter.
2014-08-02 10:52:47 +01:00
f0691a64ea
typo in a comment
2014-08-02 10:38:48 +01:00
e29804eeb4
Changed a condition in order to not show None if there is not error
2014-08-01 09:47:46 -05:00
9866e54c00
Merge branch 'master' of github.com:web2py/web2py into HEAD
2014-08-01 01:46:53 -05:00
356b4164c3
syncing
2014-08-01 01:46:46 -05:00
eff9b2d174
Merge pull request #474 from leonelcamara/master
...
Added an optional render argument to as_trees that if True causes it to ...
2014-08-01 01:43:36 -05:00
91ced9007e
Merge pull request #473 from omartrinidad/master
...
Deleted unnecessary variable
2014-08-01 01:37:35 -05:00
c73cc084ad
Merge branch 'master' of git://github.com/web2py/web2py
...
Conflicts:
applications/admin/languages/pt.py
gluon/dal.py
2014-07-29 20:19:26 +01:00
ad1dd3afdd
minor
2014-07-29 20:11:50 +01:00
8d8095b1f5
Added fix - you cannot concatenate lists with tuples and sets and it was possible that this would happen
2014-07-29 19:39:14 +01:00
757fb934d5
Fixed a bug where as_list was setting the compact value for the rows permanently instead of only temporarily while processing the rows.
2014-07-29 18:56:45 +01:00
1ee8d3cb97
Added an optional render argument to as_trees that if true causes it to render the rows before building the tree
2014-07-29 18:01:11 +01:00
c6e766d5e1
template converter for alternative delimiters
2014-07-29 11:52:50 -05:00
2be0a95dab
template converter for alternative delimiters
2014-07-29 11:45:43 -05:00
d9e0e08a91
reverted latest commit, Leonel is right, better to use closures
2014-07-29 09:57:12 -05:00
bd44a42c89
allow arbistrary params to formstyle=style(placeholder=True, errors='down'), thanks André Kablu
2014-07-28 23:29:26 -05:00
024912bda1
fixed conflict between GAE and 2-factor authentication
2014-07-28 22:01:48 -05:00
dec69b8252
Deleted unnecessary variable
...
before:
iso_format = iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}
now:
iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}
2014-07-28 11:35:56 -05:00
29303488ab
support for Oracle REGEXP_LIKE, thanks Alexander Rasin
2014-07-28 00:21:45 -05:00
0201007e2c
ldap CA support, thanks Maggs and Shane
2014-07-27 11:15:37 -05:00
c3116b094c
Merge pull request #472 from ilvalle/fix_editor
...
editor:potential fix for requests cancelled due to same origin policy
2014-07-27 10:54:23 -05:00
29ed8494dc
Merge pull request #471 from omartrinidad/master
...
Typo. Your -> You
2014-07-27 10:53:54 -05:00
a0d105a5ec
Merge pull request #470 from whoot/master
...
German translation
2014-07-27 10:53:28 -05:00
967a37adc4
online editor:potential fix for requests cancelled due to same origin policy
2014-07-22 10:22:48 +02:00
c4264c986b
Typo Spanish
2014-07-20 21:21:16 -05:00
ca18097f9c
Spanish localization in admin application
2014-07-20 21:06:50 -05:00
130540dafc
Typo. Your -> You
2014-07-20 19:10:26 -05:00
9fa165430a
Update de.py
...
Missed some translations
2014-07-17 10:20:57 +02:00
2b9a9b4d11
Update de.py
...
Missed some translations
2014-07-17 10:18:53 +02:00
cac45aa5a5
Added german translation
2014-07-16 20:03:37 +02:00
b068540c4c
Added/Improved some translations
2014-07-16 20:03:06 +02:00
c24e1d52d9
Added/Improved some translations
2014-07-16 20:02:19 +02:00
mdipierro