05689aa526
another attempt at added ssl option for tornado #511
2014-09-30 09:38:00 -05: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
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
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
bb199ad533
Merge pull request #503 from niphlod/tests/validators
...
improved coverage, fix bug with IS_LIST_OF and items not being strings
2014-09-20 12:55:56 -05:00
be07572572
Merge pull request #502 from niphlod/fix/cache_and_tests
...
fix cache.increment, added tests
2014-09-20 12:55:15 -05:00
947dcbc226
Updated from latest web2py master
2014-09-19 17:37:35 +02:00
8bbd22eba8
improved coverage, fix bug with IS_LIST_OF and items not being strings
2014-09-19 00:15:25 +02:00
50f16744a7
fix cache.increment, added tests
2014-09-16 23:50:10 +02:00
424746ce7a
R-2.9.11
2014-09-15 18:31:20 -05:00
df234fa252
reverted simplejson
2014-09-15 18:30:37 -05:00
2b50cf27e2
R-2.9.10
2014-09-15 08:05:13 -05:00
a38c7c2aa8
upgraded memcache and markdown2
2014-09-15 07:34:14 -05:00
f0461ae84a
upgraded pypyodbc.py
2014-09-14 16:41:47 -05:00
0120ad5b95
upgraded simplejson
2014-09-14 16:37:09 -05:00
e38565345c
no more split in contains, thanks Niphlod
2014-09-14 16:01:47 -05:00
b1180f483c
Merge pull request #501 from niphlod/fix/dal_contains
...
fixed bug on contains(), smart_query uses ilike instead of like
2014-09-14 16:00:00 -05:00
05a92e86f7
fixed wording and bug on contains(), made smart_query use ilike instead of like
2014-09-14 22:45:19 +02:00
75f2b90151
ilike, thanks Niphlod
2014-09-14 15:28:48 -05:00
6a75132d54
CROSS JOIN, thanks jotbe
2014-09-14 14:57:12 -05:00
3d9ebb5720
Merge pull request #497 from jotbe/master
...
Fixed #1810 : DAL.select(left=...) causes "Unknown column 't1.i1' in 'on ...
2014-09-14 14:55:38 -05:00
ec62375f6d
Merge pull request #500 from niphlod/fix/postgresql_json
...
postgresql: identifies what adapter auto-loads json values
2014-09-14 14:53:45 -05:00
f1ac5126a1
Merge pull request #499 from niphlod/tests/json_type
...
added more tests for json Field
2014-09-14 14:53:16 -05:00
e4e9038ab6
Merge pull request #498 from encompass/master
...
Improve the graphing to show the name of the application.
2014-09-14 14:52:32 -05:00
ce897b3569
added custom represent to GoogleDatastoreAdapter, thanks Alan
2014-09-14 11:58:16 -05:00
c4a4ee27c4
postgresql: identifies what adapter auto-loads json values
2014-09-14 16:39:54 +02:00
ecc6e5dc5e
added more tests for json Field
2014-09-14 16:01:22 +02:00
b991f2926f
fixed typo in driver_auto_json
2014-09-13 18:55:03 -05:00
da195b787d
Improve the graphing to show the name of the application.
2014-09-13 20:26:03 +03:00
d81f4606db
fixed mongodb json?
2014-09-13 10:35:54 -05:00
d29a108ad7
better native_json naming convention
2014-09-12 20:28:46 -05:00
94a0b1aec5
fixed json field representation
2014-09-12 20:17:49 -05:00
0a571338b6
Fixed #1810 : DAL.select(left=...) causes "Unknown column 't1.i1' in 'on clause'"
...
According to the MySQL 5.5 manual [1], comma-separated table references in joins
should be wrapped in parenthesis or JOIN should be used instead of comma.
Further explanation from the manual: The ON clause takes precedence since
a couple of versions so the operands for the ON clause change:
SELECT * FROM t1, t2 JOIN t3 ON (t1.i1 = t3.i3);
The operands for the ON are t2 and t3. t1.i1 is not known at this point.
[1] https://dev.mysql.com/doc/refman/5.5/en/join.html
2014-09-13 01:38:57 +02:00
mdipierro