Commit Graph

5063 Commits

Author SHA1 Message Date
mdipierro
29042f08a1 back to bs2 2014-03-02 17:17:21 -06:00
mdipierro
379db55111 Merge branch 'master' of github.com:web2py/web2py 2014-03-02 16:54:05 -06:00
mdipierro
4a65e773ce Merge pull request #386 from timrichardson/bs3_grid
change button & icon classes for bootstrap 3 (SQLFORM.grid)
2014-03-02 16:53:53 -06:00
mdipierro
2829a91ff7 Merge branch 'master' of github.com:web2py/web2py 2014-03-02 16:51:39 -06:00
mdipierro
083e75bfb1 Merge pull request #385 from mcamel/patch-2
Update es.py
2014-03-02 16:51:28 -06:00
mdipierro
8f95e6ebb3 Merge branch 'master' of github.com:web2py/web2py 2014-03-02 16:50:49 -06:00
mdipierro
6b1826e8da Merge pull request #384 from mcamel/patch-1
Update tools.py
2014-03-02 16:50:40 -06:00
mdipierro
f76598232a Merge branch 'master' of github.com:web2py/web2py 2014-03-02 16:49:57 -06:00
mdipierro
193149abac Merge pull request #383 from leonelcamara/master
Fix email date header format
2014-03-02 16:49:50 -06:00
mdipierro
8c155d9f76 Merge branch 'master' of github.com:web2py/web2py 2014-03-02 16:48:25 -06:00
mdipierro
2061cc3674 Merge pull request #382 from apa-1/master
Added password option for redis_cache and redis_session
2014-03-02 16:48:16 -06:00
Tim Richardson
832d6c2e97 bootstrap 3 icons for SQLFORM.grid 2014-03-03 06:16:09 +11:00
Tim Richardson
e0870bbdb2 change buttons classes for bootstrap 3 2014-03-01 12:25:08 +11:00
mdipierro
297983f411 some minor changes 2014-02-28 18:38:06 -06:00
mdipierro
1e9872c015 welcome more bootstrap3 compliant, thanks Paolo Caruccio 2014-02-27 09:33:26 -06:00
mcamel
7ddf0af81b Update es.py
Major spanish language revision.
2014-02-27 12:35:41 +01:00
mcamel
359bae6d30 Update tools.py
Internationalize 'ACCESS DENIED' message.
2014-02-27 12:09:34 +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
mdipierro
0d24d1e0d2 removed unwanted files, added respond.min.js 2014-02-24 23:57:34 -06:00
alex
31fcf51506 Added password option for redis_cache and redis_session 2014-02-24 19:01:27 -05:00
mdipierro
f3c5ed8ee6 added some bs3 files 2014-02-24 00:09:39 -06:00
mdipierro
76d77439b7 2.9.0-beta 2014-02-23 23:33:32 -06:00
mdipierro
2b428c7eb9 fixed navbar menu 2014-02-23 22:42:26 -06:00
mdipierro
106d4be274 fixed the bs3 left menu but not the login menu 2014-02-23 22:18:08 -06:00
Massimo
8e5d6bc467 partial bootstrap3 port, menus broken, thanks Paolo, sorry I broke it 2014-02-21 11:15:43 -06:00
mdipierro
e21aca045a fixed possible problem with session 2014-02-20 22:23:39 -06:00
mdipierro
a359afb799 Merge branch 'master' of github.com:web2py/web2py 2014-02-19 08:51:03 -06:00
mdipierro
41fb55cb01 Merge pull request #381 from gitanoqevaporelmundoentero/master
dal.py: DAL: parse_as_rest: solved problem when displaying tables containing more than one PK
2014-02-19 08:50:51 -06:00
mdipierro
f8cc65dfae Merge branch 'master' of github.com:web2py/web2py 2014-02-19 08:50:41 -06:00
mdipierro
e94368a356 Merge pull request #380 from timrichardson/export_widget_bootstrap
added bootstrap class btn to export widget
2014-02-19 08:50:16 -06:00
mdipierro
2c8f2173a3 w2p_even and w2p_odd in grid 2014-02-19 08:43:40 -06:00
Oscar Rodriguez
65eb1e9cb7 DAL: parse_as_rest: solved problem when displaying tables containing more than one primary key 2014-02-18 16:27:55 +01:00
Tim Richardson
69ecbdfecc added bootstrap class btn to export widget 2014-02-18 06:19:57 +11:00
mdipierro
6c622b4100 Merge pull request #374 from carpaIdea/master
greater flexibility for SQLTABLE row customization by using css
2014-02-15 11:35:07 -06:00
mdipierro
59b645c399 Merge pull request #379 from timrichardson/issues/1866
Issues/1866 (grid export): change csv export to use represent, no change to csv hidden cols or others.
2014-02-14 22:35:05 -06:00
mdipierro
134723a54b Merge pull request #378 from mcabo/patch-2
Update dal.py Table:validate_and_update
2014-02-14 22:34:10 -06:00
mdipierro
c482fed2c9 Merge pull request #375 from gitanoqevaporelmundoentero/master
dal.py: BaseAdapter: insert: solved problem when creating new record wit...
2014-02-14 22:33:20 -06:00
mdipierro
f60846ea2e catch more errors when invalid session cookie, thanks Luca 2014-02-14 22:31:05 -06:00
mdipierro
cb23f8635a fixed smartgrid bug, thanks Anthony 2014-02-14 22:27:39 -06:00
mdipierro
19f8f6bf3c SQLCustomType endswith 2014-02-14 21:03:52 -06:00
Tim Richardson
b036cb04ff remove blank line 2014-02-15 08:10:42 +11:00
Tim Richardson
050efa339d missed a label 2014-02-15 08:02:53 +11:00
Tim Richardson
faeff098fe rows.export_to_csv_file assumes the function field.represent takes only one argument, which was causing a ticket with virtua fields 2014-02-15 07:52:43 +11:00
Tim Richardson
4e298ed7d8 1866: small functionality change, better explanation.
Better 'tooltip' documention for different export formats.
Don't refer to Excel, say spreadsheet instead.
Only functionality change is standard CSV uses the rows.export_to_csv(..., represent=True) to make the output look like the on-screen grid representation.
The other formats are not changed, so both TSV and TSV with hidden columns do represent, and CSV with hidden columns does not (for speed)
2014-02-15 06:30:03 +11:00
mcabo
c810e4491a Update dal.py Table:validate_and_update
Validation has been fixed on validate_and_update method
2014-02-14 15:32:58 +01:00
Oscar Rodriguez
edbf45e542 dal.py: BaseAdapter: insert: solved problem when creating new record without passing the primary key as argument 2014-02-14 11:20:29 +01:00
mdipierro
caee53e778 fixed IS_TIME()('12:00 am') 2014-02-11 08:12:12 -06:00
Oscar Rodriguez
55281650e2 dal.py: BaseAdapter: insert: solved problem when creating new record without passing the primary key as argument 2014-02-10 19:50:18 +01:00
Paolo Caruccio
ff17b551b4 greater flexibility for row customization by using css 2014-02-06 16:25:42 +01:00