This website requires JavaScript.
ab14cc626b
Merge branch 'enhancement/makefile_coverage' of https://github.com/niphlod/web2py into niphlod-enhancement/makefile_coverage
2014-10-16 16:14:26 -05:00
a2347f54d6
Merge branch 'niphlod-fix/ilike'
2014-10-16 16:13:44 -05:00
601e928438
Merge branch 'fix/ilike' of https://github.com/niphlod/web2py into niphlod-fix/ilike
2014-10-16 16:13:25 -05:00
9091a5af25
Merge pull request #525 from ilvalle/gitignore
2014-10-16 16:12:32 -05:00
8804a9ed77
Merge pull request #524 from niphlod/js/speed
2014-10-16 16:12:05 -05:00
99ddeb65fe
Merge pull request #523 from niphlod/tests/languages_on_gae
2014-10-16 16:11:39 -05:00
ca1092efd3
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:09:38 -05:00
f988f381f2
Merge pull request #522 from ilvalle/issue_1993
2014-10-16 16:09:10 -05:00
ed25027499
Merge branch 'master' of github.com:web2py/web2py
2014-10-16 16:08:36 -05:00
4892bbe0bd
Merge pull request #521 from janknaupato/master
2014-10-16 16:08:33 -05:00
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
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
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
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
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
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
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
2014-10-16 15:48:55 -05:00
989a635dbb
fixed conflict
2014-10-16 15:47:57 -05:00
7e0e7eb6c8
ilike was wronlgy defined
2014-10-16 22:27:40 +02:00
b43ef65eb1
while we wait for a sane "prefixing", use a much more efficient way to find errors
2014-10-16 21:08:55 +02:00
b616ee6a32
fix for GAE tests often failing for no apparent reason
2014-10-16 20:56:24 +02:00
f255da79f2
updated .gitignore (progress.log and temp directory)
2014-10-16 16:05:38 +02:00
45a689a812
fix issue 1993: git push in the admin console throw an error
2014-10-16 15:07:52 +02:00
4df82d3a6e
in SQLTABLE, fixed use of REGEX_TABLE_DOT_FIELD leading to ignoring calculated / aggregate columns
2014-10-15 11:03:31 +02: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
97e1d1cd9b
added coverage template in makefile
2014-10-01 22:01:37 +02: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
2014-09-30 21:30:28 +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
2014-09-30 00:24:26 -05:00
47d9d47cff
Merge pull request #510 from niphlod/fix/1985
2014-09-29 19:46:01 -05:00
ed4febf9db
Merge pull request #509 from niphlod/fix/json_and_decimals
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
2014-09-29 19:39:41 -05:00
7b6f2bf896
Merge pull request #506 from niphlod/tests/html_and_serializers
2014-09-29 19:38:04 -05:00
11082987ea
removing bug with return true in post
2014-09-27 23:03:24 -03:00
db68a2a10e
fixes issue 1985
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
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
2014-09-25 12:49:16 +02:00
0721988b65
added tests for gluon/html.py and gluon/serializers.py
2014-09-24 21:39: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
2014-09-24 13:35:08 -05:00
c3f6fc8db8
Merge pull request #504 from niphlod/fix/storage_and_tests
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
2014-09-21 08:26:38 +02:00
bb199ad533
Merge pull request #503 from niphlod/tests/validators
2014-09-20 12:55:56 -05:00
be07572572
Merge pull request #502 from niphlod/fix/cache_and_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
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:38:57 +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
2014-09-14 14:55:38 -05:00
ec62375f6d
Merge pull request #500 from niphlod/fix/postgresql_json
2014-09-14 14:53:45 -05:00
f1ac5126a1
Merge pull request #499 from niphlod/tests/json_type
2014-09-14 14:53:16 -05:00
e4e9038ab6
Merge pull request #498 from encompass/master
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'"
2014-09-13 01:38:57 +02:00
c2b1547802
Merge pull request #496 from rpedroso/reset_password_infinite_loop
2014-09-12 17:44:40 -05:00
cd2920c2cf
fix infinite loop in request_password
2014-09-12 22:38:44 +01:00
0863bb3eca
case insensitive autocomplete again
2014-09-12 11:36:26 -05:00
04c1064ab8
Merge pull request #494 from niphlod/fix/pickle_refactoring
2014-09-11 21:13:47 -05:00
mdipierro