 Leonel Câmara
|
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 |
|
|
Leonel Câmara
|
ad1dd3afdd
|
minor
|
2014-07-29 20:11:50 +01:00 |
|
|
Leonel Câmara
|
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 |
|
|
Leonel Câmara
|
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 |
|
|
Leonel Câmara
|
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 |
|
|
Leonel Câmara
|
d01add8f2b
|
Revert "convert session to dict before pickling"
This reverts commit 36303e338d.
|
2014-02-25 12:54:31 +00:00 |
|
|
Leonel Câmara
|
752a1c7df6
|
Update tools.py
Fixed email date header not respecting the RFC2822 defined format
See:
https://groups.google.com/forum/#!topic/web2py/0Mb99H9kJOw
|
2014-02-25 12:29:51 +00:00 |
|
|
Leonel Câmara
|
36303e338d
|
convert session to dict before pickling
Session was constantly being pickled without converting to dict as it
should be.
|
2013-12-10 23:01:06 +00:00 |
|
|
Leonel Câmara
|
2f6b3a0bda
|
Mail - Added hostname to settings before locking
Added settings.hostname before locking settings, the class may need a comment explaining when is settings.hostname needed
|
2013-04-25 16:34:34 +02:00 |
|