Commit Graph

4114 Commits

Author SHA1 Message Date
Michele Comitini c127dff8e6 Merge ssh://github.com/web2py/web2py 2013-07-22 10:38:28 +02:00
mdipierro 24067bfc37 fixed issue 1600:Centralized migrations log, thanks Alan 2013-07-21 17:15:31 -05:00
mdipierro e020d5a6e2 removed '[__+-+...+-+__]' from last commit 2013-07-21 16:56:13 -05:00
mdipierro 5ce5b5672b Merge pull request #144 from michele-comitini/dal_sum_expression_fix
changed way to detect missing key since None is already a possible value
2013-07-21 14:53:26 -07:00
mdipierro 41c3f6a0b4 Merge pull request #145 from michele-comitini/postgresql_json_bug
bugfix native json fields were not supported correcly
2013-07-21 14:51:12 -07:00
Michele Comitini abf138c842 bugfix native json fields were not supported correcly 2013-07-21 23:32:58 +02:00
Michele Comitini a208e8cc9f changed way to detect missing key since None is already a possible value 2013-07-21 16:42:14 +02:00
Michele Comitini 7a9cf045de Merge branch 'master' of ssh://github.com/web2py/web2py 2013-07-21 16:37:55 +02:00
mdipierro 94a33dc47f fixed issue 1601:admin edit page first tab closing issue, thanks Paolo 2013-07-20 13:00:43 -05:00
mdipierro 3a9f328ab2 fixed issue 1598:Add SQLite to supported database stored migrations, thanks Alan (also reverted virtualfields that break tests) 2013-07-20 12:54:45 -05:00
mdipierro 650fec547b improved scripts/extract_mysql_models.py, thanks Andre Kablu 2013-07-19 17:42:15 -05:00
mdipierro 92c33f6a2b define_tables(migrate=None,fake_migrate=None) defaults to DAL(migrate=..,fake_migrate=...), thanks Paolo and Jonathan 2013-07-19 12:43:07 -05:00
mdipierro 67424d941a Merge pull request #143 from michele-comitini/table_name_quoting_bug
fix for postgresql when using an alias.
2013-07-19 10:13:33 -07:00
mdipierro be842ecfa9 Merge pull request #141 from carpaIdea/master
admin - site page - small visual enhancements
2013-07-19 10:11:09 -07:00
mdipierro 0f2f6a35f4 no more autocomplete for date/time inputs, thaks Paolo 2013-07-19 11:31:32 -05:00
mdipierro 5ebaab4ac1 fixed issue 1591:Allow sql log customization 2013-07-19 04:38:55 -05:00
mdipierro 79ac2cf607 synced web2py_bootstrap.css, fixed issue 1595:web2py_bootstrap.css in welcome, admin and examples app not in sync anymore, thanks lightdot 2013-07-19 04:34:47 -05:00
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
Paolo Caruccio 32275c00d7 admin - site page - small visual enhancements 2013-07-18 21:11:26 +02:00
Michele Comitini f79aea6255 fix for postgresql when using an alias. 2013-07-18 11:42:52 +02:00
Michele Comitini c2ecb2fe5d Merge ssh://github.com/web2py/web2py 2013-07-18 11:25:58 +02: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
Michele Comitini b8e423b24a Merge ssh://github.com/web2py/web2py 2013-07-17 16:49:43 +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
Michele Comitini 49c189547b Merge ssh://github.com/web2py/web2py 2013-07-17 02:59:33 +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