40e5e42ecc
fix issue 1840
2014-01-07 17:05:41 +11:00
4b4ada4137
Merge pull request #337 from spametki/master
...
Adapted admin cache action for gae
2013-12-28 21:17:15 -08:00
eb94780cd4
Adapted admin cache action for gae
2013-12-28 07:53:29 -03:00
750f963796
Merge pull request #336 from niphlod/fix/admin_saved_sessions
...
removed debug print statements
2013-12-27 15:09:50 -08:00
08639e6691
removed debug print statements
2013-12-27 21:28:43 +01:00
1a959baa72
fixed problem with static_version in admin, issue 1832
2013-12-23 21:37:27 -06:00
227930e25b
Merge pull request #335 from ilvalle/create_view
...
Save current working session in the online editor
2013-12-23 19:33:07 -08:00
88ce19d99f
Save current working session in online editor
2013-12-21 15:32:20 +01:00
257733e0cc
fixed a bug in models_to_run, thanks Anthony
2013-12-20 15:09:50 -06:00
e0b147ead0
Merge pull request #334 from PeterQ2/master
...
Changed RPXAccount login_form due to end-of-life for Janrain legacy widget
2013-12-20 12:49:41 -08:00
24283e7eeb
Modified RPXAccount to be backward compatible with older Web2py versions
2013-12-20 21:28:47 +01:00
afe3f306e7
Revert "Changed rpxAccount login_form due to end-of-life for Janrain IFRAME/embedded widget"
...
This reverts commit c4a68e9e5a
2013-12-20 21:27:56 +01:00
c4a68e9e5a
Changed rpxAccount login_form due to end-of-life for Janrain IFRAME/embedded widget
2013-12-20 20:33:29 +01:00
67c35e5327
Merge pull request #333 from ilvalle/create_view
...
fix issue 1825
2013-12-19 20:29:10 -08:00
53f4408652
fixed web2py.css 100% thanks DeanK
2013-12-19 20:25:48 -06:00
d72d5c64e2
fix issue 1825
2013-12-19 09:52:38 +01:00
338331aa54
Merge pull request #332 from spametki/master
...
admin app: enhanced ticket support for gae
2013-12-18 11:50:45 -08:00
42c0b7b0fa
admin app: enhanced ticket support for gae
2013-12-18 15:44:45 -03:00
28b9d322a2
fixed 1821:RadioWidget and CheckboxesWidget wrong behavior, thanks Paolo Caruccio
2013-12-17 16:50:42 -06:00
38de99fc9c
fixed 1820:uncaught pickling error with shell and app engine, thanks Alan
2013-12-17 16:43:07 -06:00
a4416bd11f
fixed issue 1819:Datastore reconnect problem, thanks Alan
2013-12-17 16:40:44 -06:00
27cbd242b2
Merge pull request #331 from spametki/master
...
Enable admin app for GAE (experimental)
2013-12-17 12:00:26 -08:00
c790b79393
autolink emails
2013-12-16 21:56:28 -06:00
7646dc11fe
Enable admin app for GAE (experimental)
2013-12-16 17:24:51 -03:00
104ec5ba73
fixed issue 1818, error in wiki/renderer, thanks Alan
2013-12-15 22:23:57 -06:00
53a0718a78
fixed problem with lack of connector in NoSQL
2013-12-15 13:31:56 -06:00
892f123975
Merge branch 'master' of github.com:web2py/web2py
2013-12-15 10:17:37 -06:00
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
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
42de43d052
fixed 1814:session.connect: parameter migrate=False has no effect, thanks lucmurer
2013-12-14 20:03:35 -06:00
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
51728fb192
a more harmonic create_file in admin editor
2013-12-14 09:37:30 +01:00
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
2d669a50b2
Manage w2p:enable-with in order to reuse form
2013-12-13 12:09:52 +01:00
4aabf3c69c
fixed typo, thanks User
2013-12-11 20:36:39 -06:00
69f9cf28df
fixed db(((db.table1.field1 + db.table1.field2)>4)).select(), thanks Boris
2013-12-11 20:33:24 -06:00
81cb51bb8d
Merge pull request #327 from ilvalle/create_view
...
invalidate function in web2py.js
2013-12-11 11:12:33 -08:00
371f97e050
invalidate function in web2py.js
2013-12-11 15:50:19 +01:00
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
b0b2fd7804
fixed naming bug. Thanks @Peter Govers for the patch
2013-12-10 21:08:39 +01:00
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
ff94a22826
fix reload of file list in editor when a new file is created
2013-12-10 11:13:04 +01:00
8244472cb2
select the right app in the file list editor sidebar
2013-12-10 09:53:50 +01:00
15dd46a91a
reverted grouping of joined tables
2013-12-09 21:28:26 -06:00
c379b00918
Merge branch 'master' of github.com:web2py/web2py
2013-12-09 21:20:49 -06:00
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
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
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
bbbee21b0d
DAL(...,adapter_args=dict(engine='MyISAM'))
2013-12-09 18:56:05 -06:00
6fb6f441d5
Merge pull request #321 from ilvalle/comment
...
toggleComment in admin editor
2013-12-09 16:37:15 -08:00
Tim Richardson