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
...
fix issue 1993: git push in the admin console throw an error
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
...
Fix for issue 1932: Aggregrate function won't show up in SQLTABLE
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
...
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
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
...
This comes from an unfortunate choice of naming conventions and the fact that
manage errors gets called even on the full document on page load.
I had a table full of .error-"classed" elements and it took nearly 30 seconds for that
snippet to hide and fade them in. We should definitevely prefix every css class with
something that won't clash with everything else.
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
...
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
mdipierro