Commit Graph

4896 Commits

Author SHA1 Message Date
mdipierro 38de99fc9c fixed 1820:uncaught pickling error with shell and app engine, thanks Alan 2013-12-17 16:43:07 -06:00
mdipierro a4416bd11f fixed issue 1819:Datastore reconnect problem, thanks Alan 2013-12-17 16:40:44 -06:00
mdipierro 27cbd242b2 Merge pull request #331 from spametki/master
Enable admin app for GAE (experimental)
2013-12-17 12:00:26 -08:00
mdipierro c790b79393 autolink emails 2013-12-16 21:56:28 -06:00
Alan Etkin 7646dc11fe Enable admin app for GAE (experimental) 2013-12-16 17:24:51 -03:00
mdipierro 104ec5ba73 fixed issue 1818, error in wiki/renderer, thanks Alan 2013-12-15 22:23:57 -06:00
mdipierro 53a0718a78 fixed problem with lack of connector in NoSQL 2013-12-15 13:31:56 -06:00
mdipierro 892f123975 Merge branch 'master' of github.com:web2py/web2py 2013-12-15 10:17:37 -06:00
mdipierro 461daca00e Merge pull request #330 from niphlod/fix/dal_quoting
fix mssql quoting issue, disabled some tests
2013-12-15 08:17:21 -08:00
niphlod 09c0069b43 fix mssql quoting issue, disabled some tests
Tests now pass on mssql. I think we need to agree on what's going on
with DAL, or we risk shipping a module with lots of changes that are
breaking backward compatibility. I'll start a thread on
web2py-developers
2013-12-15 15:06:42 +01:00
mdipierro 42de43d052 fixed 1814:session.connect: parameter migrate=False has no effect, thanks lucmurer 2013-12-14 20:03:35 -06:00
mdipierro 6ce51fa099 Merge pull request #329 from ilvalle/create_view
a more harmonic create_file in admin editor
2013-12-14 10:23:28 -08:00
ilvalle 51728fb192 a more harmonic create_file in admin editor 2013-12-14 09:37:30 +01:00
mdipierro d438b510df Merge pull request #328 from ilvalle/create_view
Manage w2p:enable-with in order to reuse form
2013-12-13 18:39:15 -08:00
ilvalle 2d669a50b2 Manage w2p:enable-with in order to reuse form 2013-12-13 12:09:52 +01:00
mdipierro 4aabf3c69c fixed typo, thanks User 2013-12-11 20:36:39 -06:00
mdipierro 69f9cf28df fixed db(((db.table1.field1 + db.table1.field2)>4)).select(), thanks Boris 2013-12-11 20:33:24 -06:00
mdipierro 81cb51bb8d Merge pull request #327 from ilvalle/create_view
invalidate function in web2py.js
2013-12-11 11:12:33 -08:00
ilvalle 371f97e050 invalidate function in web2py.js 2013-12-11 15:50:19 +01:00
mdipierro 3204447a74 Merge pull request #325 from niphlod/fix/web2py_websocket
fixed naming bug. Thanks @Peter Govers for the patch
2013-12-10 18:29:48 -08:00
niphlod b0b2fd7804 fixed naming bug. Thanks @Peter Govers for the patch 2013-12-10 21:08:39 +01:00
mdipierro a37206e259 Merge pull request #323 from ilvalle/comment
select the right app in the file list editor sidebar
2013-12-10 06:34:20 -08:00
ilvalle ff94a22826 fix reload of file list in editor when a new file is created 2013-12-10 11:13:04 +01:00
ilvalle 8244472cb2 select the right app in the file list editor sidebar 2013-12-10 09:53:50 +01:00
mdipierro 15dd46a91a reverted grouping of joined tables 2013-12-09 21:28:26 -06:00
mdipierro c379b00918 Merge branch 'master' of github.com:web2py/web2py 2013-12-09 21:20:49 -06:00
mdipierro 9bf856f6e6 Merge pull request #322 from robertop23/master
Allow create files from editor page in "files toggle"
2013-12-09 19:20:38 -08:00
robertop23 37df0a9338 Allow create files from editor page in "files toggle"
Once file is created show success message and reload using ajax the files

	modified:   applications/admin/controllers/default.py
	modified:   applications/admin/views/default/edit.html
2013-12-09 21:57:57 -04:30
robertop23 e6aaca1728 Allow create files from editor page in "files toggle"
Once file is created show success message and reload using ajax the files
	new file:   applications/admin/views/default/files_menu.html
	modified:   applications/admin/controllers/default.py
	modified:   applications/admin/views/default/edit.html
2013-12-09 21:51:55 -04:30
mdipierro bbbee21b0d DAL(...,adapter_args=dict(engine='MyISAM')) 2013-12-09 18:56:05 -06:00
mdipierro 6fb6f441d5 Merge pull request #321 from ilvalle/comment
toggleComment in admin editor
2013-12-09 16:37:15 -08:00
mdipierro cda7c66637 fixed bug in last commit, thanks User 2013-12-09 17:55:53 -06:00
mdipierro 53122bfa9f possible implementation of st_dwithin, thanks User 2013-12-09 17:06:25 -06:00
ilvalle 1fecd35bb7 toggleComment in admin editor 2013-12-09 14:38:10 +01:00
mdipierro 85058bd847 fixed this issue http://stackoverflow.com/questions/20363043/web2py-dal-left-join-and-operator-precedence 2013-12-08 09:33:30 -06:00
mdipierro 40c02651ae Merge pull request #320 from spametki/master
admin plugins page: show license information and small enhancements
2013-12-08 06:28:08 -08:00
mdipierro 8d72dc7bc4 Merge pull request #319 from ilvalle/todolist
better style for todolist panel (admin editor)
2013-12-08 06:27:26 -08:00
mdipierro 46d630a2c0 ST_DWithin for postgres 2013-12-08 08:26:00 -06:00
Alan Etkin 7e040a4177 admin plugins page: show license information and small enhancements 2013-12-08 11:01:21 -03:00
ilvalle 483de0fc30 better style for todolist panel (admin editor) 2013-12-08 10:18:47 +01:00
mdipierro 09277868d2 accept bitcoin donations 2013-12-07 20:47:08 -06:00
mdipierro 86a19c25a8 fixed issue 1808:HTML Injection on Terminal(shell) online 2013-12-07 18:36:37 -06:00
mdipierro 1715b0c378 fixed 1807:Preserve quote template for NoSQLAdapter and subclasses, thanks Alan and Michele 2013-12-07 10:20:29 -06:00
mdipierro 3599863304 fixed 1801:error in DAL using MongoDB with 'list:reference <table>', thanks Alan 2013-12-07 10:18:33 -06:00
mdipierro 91dc4f1d03 fixed issue 1806:auth.wiki does not create permissions correctly, thanks Florian 2013-12-07 10:16:21 -06:00
mdipierro 4b124cc214 Merge pull request #318 from ilvalle/todolist
Todolist panel in admin editor
2013-12-06 18:28:18 -08:00
mdipierro 0ed01e5a21 enable killing processed in windows, thanks Yair 2013-12-06 20:15:41 -06:00
ilvalle b7192d706c todolist panel (frontend part), by clicking on the TODO the relatve file is opened in a tab and the cursor is placed at the right line 2013-12-06 12:37:33 +01:00
ilvalle 557e4892b0 todo panel view 2013-12-05 11:49:21 +01:00
ilvalle b61b0bf3ad todo panel in admin editor 2013-12-05 11:43:23 +01:00