0da70c9552
Merge pull request #765 from niphlod/enhancement/tests_with_travis_docker
...
exploiting new travis-ci environment
2015-02-05 18:09:24 -06:00
407fc85dc5
Merge pull request #763 from niphlod/fix/README
...
fixed issue report link
2015-02-05 18:09:07 -06:00
4984892fe0
merged
2015-02-05 18:08:35 -06:00
d98d0872b3
Merge pull request #761 from gi0baro/master
...
Updated missing pydal warning message
2015-02-05 17:58:04 -06:00
0c1c36e022
Merge pull request #758 from niphlod/fix/safer_adapters_import
...
we should always avoid importing "optionals" without a try:except.
2015-02-05 17:57:45 -06:00
7bbeb669b9
updated pg8000 imports
2015-02-01 17:56:30 +01:00
f503750b6a
exploiting new travis-ci environment
2015-01-27 22:13:13 +01:00
440fa16bec
fixed issue report link
2015-01-27 21:26:33 +01:00
0f9fe09a15
Merge remote-tracking branch 'upstream/master' into pg8000
2015-01-27 14:02:01 +01:00
5da5d510a0
fixed some problems with new dal and SQLHTML
2015-01-27 00:16:45 -06:00
c2332b4dbd
Updated missing pydal warning message
2015-01-27 02:40:18 +01:00
7e07ff8b39
we should always avoid importing "optionals" without a try:except.
...
one clear case of "should never happen"... that happened.
in this case docs were failing builds on readthedocs because of
pypyodbc not being able to load any odbc library.
2015-01-27 00:13:45 +01:00
89c5668366
Merge branch 'master' of github.com:web2py/web2py
2015-01-26 09:22:47 -06:00
554722318a
fixed a problem with SQLFORM and DAL import
2015-01-26 09:22:12 -06:00
c18e32134c
Merge pull request #600 from kirsn/master
...
Issue 2037: apply truncate correctly
2015-01-25 13:15:21 -06:00
36fdd2e04f
Issue 2037: apply truncate correctly
2015-01-26 00:25:52 +05:30
fa7e603a7a
changed the text that reports missing mydal
2015-01-25 12:32:31 -06:00
5a0ee72260
Merge pull request #599 from gi0baro/pydal-sm
...
From DAL to pyDAL as git submodule
2015-01-25 12:13:08 -06:00
07e31b140a
Track pyDAL b533d6a7a8da8db13d73fbf706cc41cff3f05f8f, as it contains changes form latest web2py master
2015-01-25 14:15:24 +01:00
8ff22d81a1
Use contrib drivers on pyDAL
2015-01-25 14:03:43 +01:00
98efb1f874
Added a warn message when pydal isn't available
2015-01-25 02:16:08 +01:00
d5520c88b5
Merge branch 'master' of https://github.com/web2py/web2py into pydal-sm
...
Conflicts:
gluon/dal/adapters/postgres.py
gluon/dal/objects.py
2015-01-25 02:07:23 +01:00
428cc7263c
Track v0.12.25
2015-01-25 01:47:58 +01:00
4a27ce1f57
Merge pull request #598 from dmatic/master
...
Script for centos7 now also installs 'unzip' package
2015-01-23 12:10:47 -06:00
d00be02089
Merge pull request #597 from flavour/ST_SimplifyPreserveTopology
...
Add support for ST_SimplifyPreserveTopology
2015-01-23 12:10:18 -06:00
bd8f2a93ba
Merge pull request #596 from kirsn/master
...
Issue 2035: Fix the caching on Windows
2015-01-23 12:09:48 -06:00
a90a701c0d
Script for centos7 now also installs 'unzip' package
...
Some virtual server providers (like DigitalOcean) do not have unzip
installed in their centos7 image so we need to install it in our script.
2015-01-23 11:26:18 +01:00
7d6e473cd0
Merge branch 'master' of https://github.com/web2py/web2py into pydal-pip
...
Conflicts:
gluon/dal/_load.py
2015-01-22 14:49:07 +01:00
739b2e8a7b
Update objects.py
2015-01-22 11:52:42 +00:00
ff43ab7a20
Fix uuid attribute of DAL
...
It's a bound method: requires instance as first parameter
2015-01-22 12:51:56 +01:00
d2c25a0021
Add support for ST_SimplifyPreserveTopology
2015-01-22 11:45:46 +00:00
84c967de98
Issue 2035: Fix the caching on Windows - issue with filenames greater than 256 chars
2015-01-21 23:35:57 +05:30
a2f5d1cfc5
Merge pull request #595 from kvar/master
...
DAL imports portalocker from gluon to avoid conflict with another portal...
2015-01-21 09:33:11 -06:00
137f6b9640
Merge pull request #594 from michele-comitini/fix_case_sensitivity_w_recover_password
...
auth.settings.*_case_sensitivity support for password retrieval
2015-01-21 09:32:34 -06:00
52d46c4bd5
Merge pull request #592 from leonelcamara/fix_appcleanup
...
Make app_cleanup use recursive_unlink to clean the cache folder. This fi...
2015-01-21 09:32:01 -06:00
d6b4ae828c
DAL imports portalocker from gluon to avoid conflict with another portalocker module
2015-01-21 09:39:09 -05:00
acab0ad231
auth.settings.*_case_sensitivity support for password retrieval
2015-01-21 01:47:25 +01:00
580d5f00c9
Make app_cleanup use recursive_unlink to clean the cache folder. This fixes a bug with the admin cleaning of an app seen here:
...
https://groups.google.com/d/msg/web2py/YMpbAlMLln8/VFuY_xQ7WFYJ
2015-01-19 23:50:39 +00:00
2277f65f66
Fix import in dal.py
2015-01-18 18:14:53 +01:00
5043731577
Updated tools tests for pydal
2015-01-17 13:35:52 +01:00
4b337c3e2c
Merge branch 'master' into pydal-pip
...
Conflicts:
gluon/__init__.py
gluon/dal/_load.py
gluon/dal/adapters/base.py
gluon/dal/adapters/google.py
gluon/dal/adapters/postgres.py
gluon/dal/adapters/teradata.py
gluon/dal/base.py
gluon/dal/objects.py
gluon/tests/__init__.py
gluon/tests/test_dal_nosql.py
2015-01-17 13:32:06 +01:00
5bc5d0496e
R-2.9.12
2015-01-17 00:07:10 -06:00
fe34d78578
Merge pull request #591 from prasadmuley/issue2006_export_customize_query_defined_in_searchable
...
Fix: Exporting from a SQLFORM.grid with customized search queries
2015-01-16 13:06:26 -06:00
35840bc572
Fix: Exporting from a SQLFORM.grid with customized search queries
...
Massimo manually applied older diff file.
He also merged my newer diff file. So Optimized code
2015-01-16 21:01:33 +05:30
f840cdae5f
Merge pull request #590 from prasadmuley/issue2006_export_customize_query_defined_in_searchable
...
Fix: Exporting from a SQLFORM.grid with customized search queries
2015-01-16 08:51:58 -06:00
b36c38cc88
Merge pull request #586 from ilvalle/test-auth
...
Initial tests for auth
2015-01-16 08:43:40 -06:00
5958704509
Fix: Exporting from a SQLFORM.grid with customized search queries
...
issues #2006
2015-01-15 22:02:07 +05:30
0aa58c5f93
Merge branch 'master' of github.com:web2py/web2py
2015-01-15 10:18:32 -06:00
c6cc06f6c0
fixed grid export with custom search, thanks Prasad Muley
2015-01-15 09:58:13 -06:00
bda69b0e88
mail timeout
2015-01-15 09:47:57 -06:00
mdipierro