a3cbfb602c
no more epydoc
2015-02-13 23:31:12 -06:00
2ad7ee2544
improved Makefile
2015-02-13 23:30:30 -06:00
c56c96ede1
cp --parents
2015-02-13 23:23:33 -06:00
2aa8eaccb0
Merge pull request #788 from ilvalle/admin-fix-inspect
...
Fix appadmin code inspection for db hooks
2015-02-09 16:56:30 -06:00
47b3e46510
Merge pull request #781 from Pivert/update/codemirror_4.12
...
Update/codemirror 4.12
2015-02-09 16:56:09 -06:00
c02d9fe665
Merge pull request #780 from Pivert/issue/2046
...
Fixed issue/2046:
2015-02-09 16:55:03 -06:00
73cdda20e6
Merge pull request #777 from niphlod/fix/pg8000_import
...
this somehow got merged wrongly (came from #762 )
2015-02-09 16:54:51 -06:00
0d9f61eeab
Merge pull request #775 from leonelcamara/fix_enableElement
...
Fix enable element
2015-02-09 16:52:57 -06:00
e939d084fe
Fix appadmin code inspection for db hooks
2015-02-09 19:38:23 +01:00
11722b9c82
Updated codemirror to v4.12.
...
Did a lot of cleanup to limit the size of the plugin.
I kept the emmet plugin.
2015-02-07 18:41:17 +01:00
fd0cde4263
Fixed issue/2046:
...
Double scrollback in web editor because does not properly calculate display height
2015-02-07 17:22:48 +01:00
d7a0e6c4d7
this somehow got merged wrongly (came from #762 )
2015-02-06 21:28:47 +01:00
69c2bfba9a
Merge pull request #774 from niphlod/fix/issue_769
...
fixes #769
2015-02-05 18:09:50 -06:00
7e22309844
Merge pull request #768 from niphlod/enhancement/sqlhtml
...
pep8ized a taddle bit sqlhtml.py
2015-02-05 18:09:34 -06:00
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
5eb2d7b9ee
minor (removed extra space)
2015-02-05 09:34:37 +00:00
53a774827e
made w2p:enable-with follow the same style as w2p_disable_with
...
Fixed a bug in enableElement where val was being used for button elements instead of html.
2015-02-05 09:32:11 +00:00
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
7bbeb669b9
updated pg8000 imports
2015-02-01 17:56:30 +01:00
46c4b1af27
pep8ized a taddle bit sqlhtml.py
2015-01-28 22:34:04 +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
mdipierro