39dec30f52
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:07:54 -05:00
1f3030c75a
Merge pull request #520 from niphlod/js/main_hook
...
refactor main_hook to a function
2014-10-16 16:07:47 -05:00
4211c38ac5
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:07:11 -05:00
0955bc0967
Merge pull request #519 from btreecat/master
...
Fix DB2 Adapter for executesql and placeholders
2014-10-16 16:07:03 -05:00
ad5b9da4f4
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:05:35 -05:00
1c7153c985
Merge pull request #518 from gi0baro/dal-backward
...
Added back DAL.Table for backward compatibility
2014-10-16 16:05:32 -05:00
4448f01e47
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:04:46 -05:00
297961739b
Merge pull request #517 from ilvalle/master
...
Added initial gis tests
2014-10-16 16:04:36 -05:00
7aa703dc5e
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:03:51 -05:00
eeb06ce14f
Merge pull request #516 from leonelcamara/reset_password_key
...
Change reset_password to send the password as GET query var instead of a...
2014-10-16 16:02:36 -05:00
547ec7200e
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:01:57 -05:00
6cc55abc42
Merge pull request #513 from niphlod/docs/new_structure
...
with dal new structure, API doc generation was left out of the picture. ...
2014-10-16 15:59:04 -05:00
d33091d76b
added ssl option for tornado, thanks dmvieira
2014-10-16 15:58:57 -05:00
e730b11b78
Merge pull request #512 from niphlod/issue/1980
...
fixes issue 1980
2014-10-16 15:48:55 -05:00
989a635dbb
fixed conflict
2014-10-16 15:47:57 -05:00
15fe54bdca
refactor main_hook to a function
2014-10-14 23:42:41 +02:00
b2bc1835c3
Removed extra 'i' character inserted accidentally due to mode switching in vim.
2014-10-14 17:21:00 -04:00
617abda1cc
Fixed DB2 adapter when using executesql and placeholders.
2014-10-14 17:02:10 -04:00
50662b6acc
Added back DAL.Table for backward compatibility
2014-10-12 22:56:33 +02:00
c9494e2757
updated travis.yml to add postgis
2014-10-11 20:16:06 +02:00
4e110c691f
added initial gis tests
2014-10-11 20:09:09 +02:00
4cf878c9f7
Change reset_password to send the password as GET query var instead of as an argument.
...
Added some more Portuguese Translations to the Admin application.
2014-10-07 15:15:08 +01:00
b36ab988cc
updated scripts/setup-web2py-centos7.sh
2014-10-06 21:24:44 -05:00
16da2edc6d
removing returns and added 401 error send to user
2014-10-01 08:17:12 -03:00
88113637ae
with dal new structure, API doc generation was left out of the picture. GROAN!
2014-09-30 23:37:54 +02:00
1e35262e67
fixes issue 1980
...
pyflaked the module, at least a bit. Sometimes I feel developers are in a contest
where less characters and lines win. Concise implementation wins over verbose one,
but less SLOC DON'T mean somewhat better code. Just reading through
this module makes my brain hurt a bit
2014-09-30 21:37:04 +02:00
05689aa526
another attempt at added ssl option for tornado #511
2014-09-30 09:38:00 -05:00
ae5069d9b1
add example for websocket wss
2014-09-30 08:47:31 -03:00
7c8d91d4c5
Merge pull request #486 from gi0baro/DAL-modular
...
Added modular DAL, updated gluon imports to new structure
2014-09-30 00:24:26 -05:00
47d9d47cff
Merge pull request #510 from niphlod/fix/1985
...
fixes issue 1985
2014-09-29 19:46:01 -05:00
ed4febf9db
Merge pull request #509 from niphlod/fix/json_and_decimals
...
always stringify decimals. Better docstrings and a few PEP8.
2014-09-29 19:45:17 -05:00
78764072fe
hooks panel in appadmin for _before_*/_after_* callbacksm thanks Paolo valleri
2014-09-29 19:40:56 -05:00
eaf358765a
Merge pull request #507 from ilvalle/master
...
hooks panel in appadmin for _before_*/_after_* callbacks
2014-09-29 19:39:41 -05:00
7b6f2bf896
Merge pull request #506 from niphlod/tests/html_and_serializers
...
added tests for gluon/html.py and gluon/serializers.py
2014-09-29 19:38:04 -05:00
11082987ea
removing bug with return true in post
...
Error with get replicate in post: http://stackoverflow.com/questions/19563093
2014-09-27 23:03:24 -03:00
db68a2a10e
fixes issue 1985
...
plus made a pass to jsbeautifier for improved reading
plus fixed an annoying trailing comma that could cause issues with IE >= 8
2014-09-25 22:49:40 +02:00
b2d5775f82
always stringify decimals. Better docstrings and a few PEP8.
2014-09-25 21:28:55 +02:00
e40937bd8b
added https option for tornado
...
now tornado can be called by https
2014-09-25 09:51:38 -03:00
db01261c35
Fixed globals
2014-09-25 13:16:54 +02:00
6b38fb769b
Fix baseAdapter
2014-09-25 13:02:51 +02:00
8251aebdc5
hooks panel in appadmin for _before_*/_after_* callbacks
2014-09-25 12:59:59 +02:00
6e9eeb50bc
MSSQL3 types
2014-09-25 12:57:44 +02:00
502327e531
Fixed merge conflict
2014-09-25 12:51:39 +02:00
5c07c511fa
Merge branch 'master' into DAL-modular
...
* master: (58 commits)
changed version number
better types by default, given that we're on 2005 at least
fix for StorageList and tests added
improved coverage, fix bug with IS_LIST_OF and items not being strings
fix cache.increment, added tests
R-2.9.11
reverted simplejson
R-2.9.10
upgraded memcache and markdown2
upgraded pypyodbc.py
upgraded simplejson
no more split in contains, thanks Niphlod
fixed wording and bug on contains(), made smart_query use ilike instead of like
ilike, thanks Niphlod
CROSS JOIN, thanks jotbe
added custom represent to GoogleDatastoreAdapter, thanks Alan
postgresql: identifies what adapter auto-loads json values
added more tests for json Field
fixed typo in driver_auto_json
Improve the graphing to show the name of the application.
...
Conflicts:
gluon/dal.py
gluon/globals.py
gluon/tests/test_dal.py
2014-09-25 12:49:16 +02:00
0721988b65
added tests for gluon/html.py and gluon/serializers.py
...
uhm
2014-09-24 22:14:55 +02:00
f17493b52c
changed version number
2014-09-24 13:36:06 -05:00
4c45de7efd
Merge pull request #505 from niphlod/fix/mssql3_mappings
...
better types for mssql3://, given that we're on 2005 at least
2014-09-24 13:35:08 -05:00
c3f6fc8db8
Merge pull request #504 from niphlod/fix/storage_and_tests
...
fix for StorageList and tests added
2014-09-24 13:34:20 -05:00
4d42442c31
better types by default, given that we're on 2005 at least
2014-09-23 00:04:42 +02:00
34a417cfa0
fix for StorageList and tests added
...
gluon/storage.py
StorageList had a recursion error (please check the implementation before committing)
gluon/tests*
added the fix_path module to avoid those ugly lines at the beginning of each test file
added tests for gluon.contenttype and test_fileutils
added tests for missing Storage methods
2014-09-21 08:26:38 +02:00
mdipierro