dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,593 Commits 18 Branches 72 Tags
fc19a4dd39a92658e8e83ca8ecb4c5f6e72064f0
Commit Graph
3979 Commits
Author SHA1 Message Date
mdipierro a3a3936d3a Merge pull request #533 from jotbe/master 
Cleanup: Removed presumed debug print statement.
 2014-10-22 21:28:35 -05:00
mdipierro 50540b2f97 Merge branch 'fix/pg8000' of https://github.com/niphlod/web2py into niphlod-fix/pg8000 2014-10-22 21:26:59 -05:00
mdipierro 8ec68e393a Merge pull request #531 from leonelcamara/apostrophe_fpdf 
Fix for sanitize(''') returning ''' instead of '''
 2014-10-22 21:25:49 -05:00
Jan Beilicke 643748db02 Cleanup: Removed presumed debug print statement. 2014-10-21 15:56:21 +02:00
mdipierro ba374dea2c Merge pull request #528 from ilvalle/pg_rename 
renamed postgre.py into postgres.py, removed 2 overriding PG
 2014-10-18 15:18:40 -05:00
niphlod 794979abe1 pg8000 doesn't support json at all 2014-10-18 20:20:34 +02:00
Leonel Câmara f10b1b93a9 fixed remaining methods in HTMLParser that were still using the old htmllib.HTMLParser interface 2014-10-18 13:05:27 +01:00
Leonel Câmara b2401a5923 Fix for sanitize(''') returning ''' instead of ''' 2014-10-18 12:37:32 +01:00
ilvalle 9076971d75 renamed postgre.py into postgres.py, removed starts/ends with overriding in PG adapter 2014-10-17 17:56:54 +02:00
ilvalle 64ae27862a few more tests: gis functions, starts/endswith 2014-10-17 11:16:07 +02:00
mdipierro 601e928438 Merge branch 'fix/ilike' of https://github.com/niphlod/web2py into niphlod-fix/ilike 2014-10-16 16:13:25 -05:00
mdipierro 99ddeb65fe Merge pull request #523 from niphlod/tests/languages_on_gae 
fix for GAE tests often failing for no apparent reason
 2014-10-16 16:11:39 -05:00
mdipierro ed25027499 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:08:36 -05:00
mdipierro 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
mdipierro 4211c38ac5 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:07:11 -05:00
mdipierro 0955bc0967 Merge pull request #519 from btreecat/master 
Fix DB2 Adapter for executesql and placeholders
 2014-10-16 16:07:03 -05:00
mdipierro ad5b9da4f4 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:05:35 -05:00
mdipierro 1c7153c985 Merge pull request #518 from gi0baro/dal-backward 
Added back DAL.Table for backward compatibility
 2014-10-16 16:05:32 -05:00
mdipierro 4448f01e47 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:04:46 -05:00
mdipierro 297961739b Merge pull request #517 from ilvalle/master 
Added initial gis tests
 2014-10-16 16:04:36 -05:00
mdipierro 7aa703dc5e Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:03:51 -05:00
mdipierro 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
mdipierro 547ec7200e Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:01:57 -05:00
mdipierro 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
mdipierro d33091d76b added ssl option for tornado, thanks dmvieira 2014-10-16 15:58:57 -05:00
mdipierro e730b11b78 Merge pull request #512 from niphlod/issue/1980 
fixes issue 1980
 2014-10-16 15:48:55 -05:00
mdipierro 989a635dbb fixed conflict 2014-10-16 15:47:57 -05:00
niphlod 7e0e7eb6c8 ilike was wronlgy defined 2014-10-16 22:27:40 +02:00
niphlod b616ee6a32 fix for GAE tests often failing for no apparent reason 2014-10-16 20:56:24 +02:00
Jan M. Knaup 4df82d3a6e in SQLTABLE, fixed use of REGEX_TABLE_DOT_FIELD leading to ignoring calculated / aggregate columns 2014-10-15 11:03:31 +02:00
Stephen Tanner b2bc1835c3 Removed extra 'i' character inserted accidentally due to mode switching in vim. 2014-10-14 17:21:00 -04:00
Stephen Tanner 617abda1cc Fixed DB2 adapter when using executesql and placeholders. 2014-10-14 17:02:10 -04:00
gi0baro 50662b6acc Added back DAL.Table for backward compatibility 2014-10-12 22:56:33 +02:00
ilvalle 4e110c691f added initial gis tests 2014-10-11 20:09:09 +02:00
Leonel Câmara 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
Diogo 16da2edc6d removing returns and added 401 error send to user 2014-10-01 08:17:12 -03:00
niphlod 88113637ae with dal new structure, API doc generation was left out of the picture. GROAN! 2014-09-30 23:37:54 +02:00
niphlod 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
mdipierro 05689aa526 another attempt at added ssl option for tornado #511 2014-09-30 09:38:00 -05:00
Diogo ae5069d9b1 add example for websocket wss 2014-09-30 08:47:31 -03:00
mdipierro 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
mdipierro 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
Diogo 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
niphlod b2d5775f82 always stringify decimals. Better docstrings and a few PEP8. 2014-09-25 21:28:55 +02:00
Diogo e40937bd8b added https option for tornado 
now tornado can be called by https
 2014-09-25 09:51:38 -03:00
gi0baro db01261c35 Fixed globals 2014-09-25 13:16:54 +02:00
gi0baro 6b38fb769b Fix baseAdapter 2014-09-25 13:02:51 +02:00
gi0baro 6e9eeb50bc MSSQL3 types 2014-09-25 12:57:44 +02:00
gi0baro 502327e531 Fixed merge conflict 2014-09-25 12:51:39 +02:00
gi0baro 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