dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,812 Commits 18 Branches 72 Tags
4e019fe6fda97b19e75a0dda7d88a951443869ec
Commit Graph
4128 Commits
Author SHA1 Message Date
mdipierro c2a46c5d6d web2py.py -e 2015-02-18 10:29:20 -06:00
mdipierro 8a9d95de41 fixed 'Return object from represent method of field' 2015-02-17 12:01:36 -06:00
mdipierro d6c565f33f fix HIGHEST PROTOCOL? 2015-02-15 23:35:15 -06:00
mdipierro b8ce120a8e Merge pull request #792 from niphlod/fix/735 
fixes #735. Review CAREFULLY before merging
 2015-02-15 16:44:09 -06:00
mdipierro 1c431909bf Merge pull request #796 from niphlod/fix/docs 
adjusted docs to newer structure
 2015-02-15 16:43:03 -06:00
mdipierro 8139b65152 updated list of supporting companies 2015-02-15 16:16:15 -06:00
niphlod 3fed961c20 adjusted docs to newer structure 2015-02-15 23:13:57 +01:00
niphlod 4d9548b1f5 fixes #735. Review CAREFULLY before merging 2015-02-13 22:54:27 +01:00
niphlod d7a0e6c4d7 this somehow got merged wrongly (came from #762) 2015-02-06 21:28:47 +01:00
mdipierro 69c2bfba9a Merge pull request #774 from niphlod/fix/issue_769 
fixes #769
 2015-02-05 18:09:50 -06:00
mdipierro 7e22309844 Merge pull request #768 from niphlod/enhancement/sqlhtml 
pep8ized a taddle bit sqlhtml.py
 2015-02-05 18:09:34 -06:00
mdipierro 4984892fe0 merged 2015-02-05 18:08:35 -06:00
mdipierro d98d0872b3 Merge pull request #761 from gi0baro/master 
Updated missing pydal warning message
 2015-02-05 17:58:04 -06:00
mdipierro 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
niphlod 1b34216072 fixes #769 
- fixed response.include_files() to behave correctly with 
  response.static_version_urls
- added response.static_version_urls to admin
- refactored admin URL() usage passing always and correctly 'static'
  as the controller
 2015-02-04 22:18:42 +01:00
ilvalle 7bbeb669b9 updated pg8000 imports 2015-02-01 17:56:30 +01:00
niphlod 46c4b1af27 pep8ized a taddle bit sqlhtml.py 2015-01-28 22:34:04 +01:00
ilvalle 0f9fe09a15 Merge remote-tracking branch 'upstream/master' into pg8000 2015-01-27 14:02:01 +01:00
mdipierro 5da5d510a0 fixed some problems with new dal and SQLHTML 2015-01-27 00:16:45 -06:00
gi0baro c2332b4dbd Updated missing pydal warning message 2015-01-27 02:40:18 +01:00
niphlod 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
mdipierro 89c5668366 Merge branch 'master' of github.com:web2py/web2py 2015-01-26 09:22:47 -06:00
mdipierro 554722318a fixed a problem with SQLFORM and DAL import 2015-01-26 09:22:12 -06:00
kirsn 36fdd2e04f Issue 2037: apply truncate correctly 2015-01-26 00:25:52 +05:30
mdipierro fa7e603a7a changed the text that reports missing mydal 2015-01-25 12:32:31 -06:00
gi0baro 07e31b140a Track pyDAL b533d6a7a8da8db13d73fbf706cc41cff3f05f8f, as it contains changes form latest web2py master 2015-01-25 14:15:24 +01:00
gi0baro 8ff22d81a1 Use contrib drivers on pyDAL 2015-01-25 14:03:43 +01:00
gi0baro 98efb1f874 Added a warn message when pydal isn't available 2015-01-25 02:16:08 +01:00
gi0baro 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
gi0baro 428cc7263c Track v0.12.25 2015-01-25 01:47:58 +01:00
mdipierro d00be02089 Merge pull request #597 from flavour/ST_SimplifyPreserveTopology 
Add support for ST_SimplifyPreserveTopology
 2015-01-23 12:10:18 -06:00
gi0baro 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
Fran Boon 739b2e8a7b Update objects.py 2015-01-22 11:52:42 +00:00
Giovanni Barillari ff43ab7a20 Fix uuid attribute of DAL 
It's a bound method: requires instance as first parameter
 2015-01-22 12:51:56 +01:00
Fran Boon d2c25a0021 Add support for ST_SimplifyPreserveTopology 2015-01-22 11:45:46 +00:00
kirsn 84c967de98 Issue 2035: Fix the caching on Windows - issue with filenames greater than 256 chars 2015-01-21 23:35:57 +05:30
mdipierro 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
mdipierro 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
Kristofor Varhus d6b4ae828c DAL imports portalocker from gluon to avoid conflict with another portalocker module 2015-01-21 09:39:09 -05:00
Michele Comitini acab0ad231 auth.settings.*_case_sensitivity support for password retrieval 2015-01-21 01:47:25 +01:00
Leonel Câmara 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
gi0baro 2277f65f66 Fix import in dal.py 2015-01-18 18:14:53 +01:00
gi0baro 5043731577 Updated tools tests for pydal 2015-01-17 13:35:52 +01:00
gi0baro 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
mdipierro 5bc5d0496e R-2.9.12 2015-01-17 00:07:10 -06:00
Prasad Muley 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
mdipierro 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
mdipierro b36c38cc88 Merge pull request #586 from ilvalle/test-auth 
Initial tests for auth
 2015-01-16 08:43:40 -06:00
Prasad Muley 5958704509 Fix: Exporting from a SQLFORM.grid with customized search queries 
issues #2006
 2015-01-15 22:02:07 +05:30
mdipierro 0aa58c5f93 Merge branch 'master' of github.com:web2py/web2py 2015-01-15 10:18:32 -06:00