Commit Graph

4085 Commits

Author SHA1 Message Date
mdipierro
bf3d345ce5 fixed issue 1594:radio widget layout conflicts with bootstrap, thanks Paolo Caruccio 2013-07-19 04:33:18 -05:00
mdipierro
5add14bf68 possibly fixed a problem with virtualfields in fields option of SQLFORM.grid, thanks peckto 2013-07-19 03:28:11 -05:00
mdipierro
e0d3d99be0 Merge pull request #140 from carpaIdea/master
files toggle in admin, maybe as Massimo would want it
2013-07-18 00:24:48 -07:00
mdipierro
8004dc81f4 fixed conflict 2013-07-18 02:23:31 -05:00
Paolo Caruccio
1e5831969b files toggle in admin, maybe as Massimo would want it 2013-07-18 01:56:45 +02:00
Michele Comitini
460b76f527 removed pycrypto leaving only strxor for speeding up pbkdf2 2013-07-18 00:54:44 +02:00
mdipierro
8d46c57985 Merge branch 'master' of github.com:web2py/web2py 2013-07-17 17:20:04 -05:00
mdipierro
a182d322c6 Merge pull request #138 from niphlod/issue/1592
fix issue 1592
2013-07-17 15:19:37 -07:00
mdipierro
30f0215dc6 fixed a problem in recent commit when pycrypto is missing, the fix is temporary 2013-07-17 17:19:29 -05:00
niphlod
bb7715445a fix issue 1592 2013-07-17 23:18:04 +02:00
mdipierro
63ca73d6f0 fixed issue 1587:Mongodb error on id 2013-07-17 07:37:38 -05:00
mdipierro
cd14782641 Merge pull request #136 from michele-comitini/speed_triks1
optimizations. Switch to PyCrypto support in pbkdf2 when possible.
2013-07-17 05:24:19 -07:00
Michele Comitini
f8c20760d5 optimizations. Switch to PyCrypto support in pbkdf2 when possible. 2013-07-17 03:01:04 +02:00
mdipierro
1be0f3f468 fixed problem with tempfiles in Android, thanks Fernando Pacheco 2013-07-16 13:15:11 -05:00
mdipierro
acbdeca03b fixed bug in recent commit, thanks Olivier Johner 2013-07-16 05:19:13 -05:00
mdipierro
0eb0619c0c Merge pull request #135 from carpaIdea/master
customization of upload package input in admin interface
2013-07-15 07:50:24 -07:00
mdipierro
a7cc24254b fixed issue 1586:MSSQL Date format is language dependent, thanks score2000 2013-07-15 09:34:04 -05:00
mdipierro
b60452ef47 fixed issue topic/web2py/LGxJR85pG88, thanks Oliver 2013-07-15 09:22:01 -05:00
Paolo Caruccio
38828c9ece customization of upload package input in admin interface 2013-07-15 00:27:49 +02:00
mdipierro
fdad44315f reduced memory footprint by conditionally loading Tk 2013-07-14 16:52:42 -05:00
mdipierro
5c3d2edf3b moved the locals restoring logic, thanks ozancag 2013-07-14 15:50:23 -05:00
mdipierro
af2ae42fdf Merge branch 'master' of github.com:web2py/web2py 2013-07-14 14:37:15 -05:00
mdipierro
848f021f71 Merge pull request #134 from niphlod/issue/admin_refactor
first step to a nicer code style of admin
2013-07-14 12:37:02 -07:00
mdipierro
c5b88a557d Merge branch 'master' of github.com:web2py/web2py 2013-07-14 14:36:27 -05:00
mdipierro
51eca64fde Merge pull request #133 from niphlod/feature/js_inline
normalized behaviour in A() handler, fixed anonymous function block.
2013-07-14 12:36:00 -07:00
mdipierro
8fc93db229 Merge branch 'master' of github.com:web2py/web2py 2013-07-14 14:35:39 -05:00
mdipierro
27535b032d Merge pull request #132 from mpranjic/masterfix
updating jquery mobile to 1.3.1
2013-07-14 12:35:27 -07:00
mdipierro
569bf16977 Merge branch 'master' of github.com:web2py/web2py 2013-07-14 14:35:02 -05:00
mdipierro
7a0f6eafb7 Merge pull request #131 from swayf/feature/multiple_submit_buttons_in_grid
allows add multiple submit buttons in "selectable" mode in SQLFORM.grid ...
2013-07-14 12:34:50 -07:00
mdipierro
927e30eb45 Merge branch 'master' of github.com:web2py/web2py 2013-07-14 14:33:48 -05:00
mdipierro
e34bdb5d67 Merge pull request #124 from oliveiraev/fix-pymysql-charset
Adding some charsets
2013-07-14 12:33:27 -07:00
niphlod
40d1ff9d17 first step to a nicer code style of admin 2013-07-14 20:13:37 +02:00
niphlod
2d95327a79 normalized behaviour in A() handler, fixed anonymous function block. 2013-07-14 19:42:49 +02:00
mdipierro
44697f5544 setting locale to default, fixed issue 1583, thanks ozancag 2013-07-14 06:05:49 -05:00
mdipierro
1a58701d57 files toggle in admin, not yet as I would want it 2013-07-14 04:57:59 -05:00
Oleg
59f8362f75 syntax fix for python 2.5 2013-07-14 11:32:40 +02:00
mdipierro
324b71c3af fixed issue 1582:Cannot login_bare in a web2py shell, thanks Alan 2013-07-13 19:10:12 -05:00
mdipierro
70f34e4532 better scripts/setup-web2py-nginx-uwsgi-ubuntu.sh, thanks Anthony 2013-07-12 11:58:16 -05:00
mdipierro
d1065178bd css.patch, less html5 syntax error noise, thanks Jonathan 2013-07-12 09:52:31 -05:00
mpranjic
b0ac67a8f6 updating jquery mobile to 1.3.1 2013-07-12 12:19:33 +02:00
mdipierro
9643086b34 TRHEAD->__TRHEAD__ as Jonathan suggested 2013-07-11 13:01:47 -05:00
mdipierro
8c19075f82 Merge pull request #130 from carpaIdea/master
some fixes for small visual bugs in bootstrap layout
2013-07-11 10:54:03 -07:00
mdipierro
db715021bf Merge pull request #128 from mpranjic/masterfix
updating jQueryUI version
2013-07-11 10:52:58 -07:00
mdipierro
31c26dc03d Merge pull request #129 from michele-comitini/select_speedup1
speedup in case of keyed  tables
2013-07-11 10:51:21 -07:00
mdipierro
988ee82496 fixed issue 1579:Row.__getitem__(): count of 0 raises AttributeError, thanks Dominic 2013-07-11 11:49:49 -05:00
mdipierro
207105a21e fix to web2py_bookstrap.css, thanks Paolo 2013-07-11 11:35:46 -05:00
mdipierro
6566b2d2ed html patch, thanks Jonathan, but TRHEAD commented 2013-07-11 11:28:12 -05:00
Oleg
773b19d373 allows add multiple submit buttons in "selectable" mode in SQLFORM.grid (with different decorate css classes) 2013-07-11 18:11:37 +02:00
mdipierro
5ec22132a3 sync'd with gluino again 2013-07-11 09:14:41 -05:00
Paolo Caruccio
1b7bbfaf95 fixes for small visual bugs in bootstrap layout
- form input error text when formstyle='bootstrap' has fixed width.
In narrow screens:
- topbar has space in left and right sides;
- login button in topbar is unlined.
2013-07-10 15:55:51 +02:00