f45bf73992
Merge branch 'master' of github.com:web2py/web2py
2015-05-03 16:42:42 -05:00
94461724f6
Merge pull request #954 from cassiobotaro/master
...
Mantain backward compatibility
2015-05-03 16:42:12 -05:00
c36c391786
More test to prove backward compatibility
2015-05-03 14:03:26 -03:00
f6db7c995f
Its necessary because of default=None trick
2015-05-03 14:02:11 -03:00
ccc4b96709
Added one more test
...
Added one more test to avoid mistake with backward compatibility
2015-05-03 13:36:24 -03:00
71b02e3044
Maintain backward compatibility
...
Little change to maintain backward compatibility, related to #590
2015-05-03 13:35:05 -03:00
99fb1c3010
Merge branch 'master' of github.com:web2py/web2py
2015-05-03 10:31:37 -05:00
20067d7b93
Merge pull request #953 from niphlod/fix/691
...
fixes issue #691
2015-05-03 10:31:32 -05:00
44eb35c617
Merge pull request #952 from niphlod/fix/734
...
fixes #734
2015-05-03 10:31:21 -05:00
df03317054
Merge pull request #951 from niphlod/tests/cache_ram_and_disk
...
more tests, general cleanup
2015-05-03 10:31:08 -05:00
9d873cbd1c
reverted last commit
2015-05-03 10:30:43 -05:00
1bb4117cbd
Merge pull request #950 from cassiobotaro/master
...
Fix List behaviour and added new feature
2015-05-03 10:27:46 -05:00
e834186a86
Merge pull request #950 from cassiobotaro/master
...
Fix List behaviour and added new feature
2015-05-03 10:23:08 -05:00
1394942feb
removed reference to python 2.5
2015-05-03 10:09:07 -05:00
32b9b5c799
fixes issue #691
2015-05-03 16:06:10 +02:00
340d7b5e6f
fixes #734
2015-05-03 15:51:13 +02:00
302f56ecc1
more tests, general cleanup
2015-05-03 15:33:19 +02:00
9b12459a82
Merge branch 'master' of github.com:web2py/web2py
2015-05-02 23:16:12 -05:00
8e3925820c
allow disabling of confirmation in js delete
2015-05-02 23:16:05 -05:00
279d71d4cd
Merge pull request #936 from niphlod/enhancement/919
...
added newer Recaptcha2 class to deal with v2.0. Fixes #919
2015-05-02 23:07:36 -05:00
258e2e57ae
Fix import errors
2015-05-02 20:36:35 -03:00
9357d810d8
Fix List behaviour and added new feature
2015-05-02 20:24:04 -03:00
54b385b321
grid(user_cursor=False) by default because it is broken
2015-04-26 17:16:19 -05:00
df039e734c
2.10.4 stable
2015-04-26 10:10:18 -05:00
58533954dc
R-2.10.4
2015-04-26 09:07:07 -05:00
236dc4b943
fixed submodule tracking
2015-04-26 09:04:55 -05:00
6612fd1cfe
told git to track the right submodule branch
2015-04-26 08:50:16 -05:00
520950ba74
track track 15.03-maintenance (19/04/15)
2015-04-26 08:44:45 -05:00
e943aa9c25
minor compatibility fix in ldap_auth
2015-04-26 08:39:47 -05:00
756aec7206
Merge pull request #944 from stephenrauch/ldap_auth-fix-nosql
...
Fix ldap_auth for NoSQL databases
2015-04-26 08:29:26 -05:00
970e2ed35c
Merge pull request #939 from smorrison/slack_webhook_support
...
add support for reporting web2py errors via slack.com
2015-04-26 08:29:00 -05:00
1388c39636
Merge pull request #935 from niphlod/docs/dal
...
extend underline for proper sphinx formatting
2015-04-26 08:27:48 -05:00
6e84737924
Merge pull request #934 from niphlod/fix/931
...
fixes #931 . Thanks @butsyk for spotting the bug
2015-04-26 08:27:35 -05:00
0ad50630f2
Fix ldap_auth for NoSQL databases
...
Unroll query with join to two queries when working with DB's which don't
support joins.
2015-04-24 11:02:18 -07:00
f42ee15f5f
add support for reporting web2py errors via slack.com
2015-04-22 19:00:21 -05:00
77f154a56b
added newer Recaptcha2 class to deal with v2.0. Fixes #919
...
Improvements over the "old" v1.0
- behaves well also without javascript
- use_ssl is redundant, v2.0 works only in https mode
- ajax is not useful anymore as the newer API is a lot easier
Adjusted also the addrow() method that was missing newer formstyles.
2015-04-22 00:10:05 +02:00
2b0bfba649
extend underline for proper sphinx formatting
2015-04-21 23:59:07 +02:00
9f1edf267d
fixes #931 . Thanks @butsyk for spotting the bug
2015-04-21 21:59:42 +02:00
f3bda9ad02
changed version
2015-04-20 18:02:17 -05:00
f8afc76263
Merge pull request #930 from gi0baro/master
...
pydal -> track 15.03-maintenance (20/04/15)
2015-04-20 10:39:29 -05:00
65b4aaf842
pydal -> track 15.03-maintenance (20/04/15)
2015-04-20 17:29:22 +02:00
1b729cfbfc
Merge pull request #928 from niphlod/fix/920
...
small typo. Fixes #920
2015-04-19 15:32:28 -05:00
1aa5f30091
Merge pull request #926 from niphlod/enhancement/web2py_on_iis
...
added web.config to deploy web2py on IIS
2015-04-19 15:32:11 -05:00
b17174c04c
Merge pull request #925 from gi0baro/master
...
pydal -> track 15.03-maintenance (19/04/15)
2015-04-19 15:31:41 -05:00
ac80adc9b4
small typo. Fixes #920
2015-04-19 19:49:25 +02:00
888fa3dfc8
added setup script
2015-04-19 19:00:59 +02:00
f3d815e84b
added web.config to deploy web2py on IIS
2015-04-19 15:51:17 +02:00
9915fdf093
pydal -> track 15.03-maintenance (19/04/15)
2015-04-19 14:45:19 +02:00
ef8f802df9
R-2.10.4.beta
2015-04-18 15:44:04 -05:00
f7bf1020df
reverted gluon/packages/dal
2015-04-18 15:28:12 -05:00
mdipierro