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

..

contrib

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

dal

Updated from latest web2py master

2014-09-19 17:37:35 +02:00

tests

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

__init__.py

fixed problem with circular imputs on GAE?

2014-03-13 08:41:31 -05:00

admin.py

more docstring fixes

2014-01-29 23:01:52 +01:00

cache.py

fix cache.increment, added tests

2014-09-16 23:50:10 +02:00

cfs.py

docstrings fixes

2014-01-27 22:56:58 +01:00

compileapp.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

contenttype.py

docstrings fixes

2014-01-27 22:56:58 +01:00

custom_import.py

Fixed issue 1954, re-raising exceptions the right way, thanks Marton

2014-08-07 23:33:34 -05:00

debug.py

more docstring fixes

2014-01-29 23:01:52 +01:00

decoder.py

more docstring fixes

2014-01-29 23:01:52 +01:00

fileutils.py

fixed opening get_session for new session files

2014-09-06 18:10:54 -05:00

globals.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

highlight.py

more docstring fixes

2014-01-29 23:01:52 +01:00

html.py

refactored pickle everywhere but Session, removed unused imports

2014-09-10 19:12:10 +02:00

http.py

fixed redirection bug

2014-08-08 00:07:34 -05:00

import_all.py

many pep8 improvements

2012-10-19 12:33:53 -05:00

languages.py

added tests and refactored incorrect docstrings

2014-05-29 23:34:32 +02:00

main.py

Added modular DAL, updated gluon imports to new structure

2014-09-03 12:48:03 +02:00

messageboxhandler.py

fixed tkMessageBox problem, thanks Bruno

2013-01-21 08:39:44 -06:00

myregex.py

sphinx-compatible docstrings

2014-03-11 22:18:33 +01:00

newcron.py

refactored pickle everywhere but Session, removed unused imports

2014-09-10 19:12:10 +02:00

portalocker.py

sphinx-compatible docstrings

2014-03-12 22:03:42 +01:00

recfile.py

fixed appadmin/check_credentials problem

2014-09-06 22:57:26 -05:00

reserved_sql_keywords.py

sphinx-compatible docstrings

2014-03-12 22:03:42 +01:00

restricted.py

refactored pickle everywhere but Session, removed unused imports

2014-09-10 19:12:10 +02:00

rewrite.py

sphinx-compatible docstrings

2014-03-12 22:03:42 +01:00

rocket.py

Merged explorigin/Rocket and brought web2py's rocket more in line with upstream.

2012-11-18 00:32:24 -06:00

rocket.py.footer

PEP8'd rocket.py.footer (to be removed from rocket.py).

2012-11-18 00:32:24 -06:00

sanitizer.py

sphinx-compatible docstrings (7 modules remaining...)

2014-03-23 21:46:25 +01:00

scheduler.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

serializers.py

possible fix to rss

2014-09-10 08:26:23 -05:00

settings.py

sphinx-compatible docstrings (7 modules remaining...)

2014-03-23 21:46:25 +01:00

shell.py

Added modular DAL, updated gluon imports to new structure

2014-09-03 12:48:03 +02:00

sql.py

Added modular DAL, updated gluon imports to new structure

2014-09-03 12:48:03 +02:00

sqlhtml.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

storage.py

fix for StorageList and tests added

2014-09-21 08:26:38 +02:00

streamer.py

very weird GAE hack

2014-08-14 16:27:46 -05:00

template.py

fix custom view delimiters

2014-09-04 19:16:00 +08:00

tools.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

utf8.py

sphinx-compatible docstring (only DAL remains)

2014-03-24 22:30:50 +01:00

utils.py

refactored pickle everywhere but Session, removed unused imports

2014-09-10 19:12:10 +02:00

validators.py

Merge branch 'master' into DAL-modular

2014-09-25 12:49:16 +02:00

widget.py

Added modular DAL, updated gluon imports to new structure

2014-09-03 12:48:03 +02:00

xmlrpc.py

sphinx-compatible docstring (only DAL remains)

2014-03-24 22:30:50 +01:00