Commit Graph
100 Commits
Author SHA1 Message Date
mdipierro 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
mdipierro 54b385b321 grid(user_cursor=False) by default because it is broken 2015-04-26 17:16:19 -05:00
mdipierro df039e734c 2.10.4 stable 2015-04-26 10:10:18 -05:00
mdipierro 58533954dc R-2.10.4 2015-04-26 09:07:07 -05:00
mdipierro 236dc4b943 fixed submodule tracking 2015-04-26 09:04:55 -05:00
mdipierro 6612fd1cfe told git to track the right submodule branch 2015-04-26 08:50:16 -05:00
mdipierro 520950ba74 track track 15.03-maintenance (19/04/15) 2015-04-26 08:44:45 -05:00
mdipierro e943aa9c25 minor compatibility fix in ldap_auth 2015-04-26 08:39:47 -05:00
mdipierro 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
mdipierro 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
mdipierro 1388c39636 Merge pull request #935 from niphlod/docs/dal
extend underline for proper sphinx formatting
2015-04-26 08:27:48 -05:00
mdipierro 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
mdipierro f3bda9ad02 changed version 2015-04-20 18:02:17 -05:00
mdipierro f8afc76263 Merge pull request #930 from gi0baro/master
pydal -> track 15.03-maintenance (20/04/15)
2015-04-20 10:39:29 -05:00
mdipierro 1b729cfbfc Merge pull request #928 from niphlod/fix/920
small typo. Fixes #920
2015-04-19 15:32:28 -05:00
mdipierro 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
mdipierro b17174c04c Merge pull request #925 from gi0baro/master
pydal -> track 15.03-maintenance (19/04/15)
2015-04-19 15:31:41 -05:00
mdipierro ef8f802df9 R-2.10.4.beta 2015-04-18 15:44:04 -05:00
mdipierro f7bf1020df reverted gluon/packages/dal 2015-04-18 15:28:12 -05:00
mdipierro 75b8ceb022 Merge pull request #923 from gi0baro/validators
Fix serializers injection over new pydal
2015-04-18 15:17:06 -05:00
mdipierro b4f3784136 Merge pull request #922 from dokime7/patch-7
Fix crash with list:reference field
2015-04-18 15:16:25 -05:00
mdipierro f1297bb827 Merge pull request #918 from niphlod/enhancement/anyserver
added waitress to anyserver
2015-04-18 15:15:02 -05:00
mdipierro 435ebeaae4 more consulting companies 2015-04-18 15:13:03 -05:00
mdipierro f33ccf3366 experimental fix for represent 2015-04-16 16:53:12 -05:00
mdipierro e940228eaf Merge pull request #912 from ilvalle/sqlcustomtype
extend sqlcustomform to support widget/represent
2015-04-15 13:01:50 -05:00
mdipierro 50769a627a Merge pull request #916 from gi0baro/issue-904
Fixes #904
2015-04-15 13:01:19 -05:00
mdipierro e68ecaa131 Merge pull request #915 from BuhtigithuB/update/gluon-contrib-pypyodbc
Update gluon/contrib/pypyodbc.py 1.3.0 -> 1.3.3
2015-04-15 13:01:01 -05:00
mdipierro b3b95ccf5f Merge pull request #906 from niphlod/fix/895
file is already open at this point... fixes #895
2015-04-08 23:24:16 -05:00
mdipierro 15ff8669cb fixed dal tracking, thanks Niphlod 2015-04-06 16:24:49 -05:00
mdipierro a921751e8e stripe form bs3 compatible, disabled cache.ram max utilization 2015-04-05 18:17:27 -05:00
mdipierro b02e8a6d5f fixed problem with custom import and upgraded jquery.js 2015-04-02 16:30:15 -05:00
mdipierro a2b17967cf Merge pull request #898 from ilvalle/issue-896
fix web2py/web2py#896, avoid to select blob fields in sqlform.grid
2015-04-02 16:24:26 -05:00
mdipierro 343ebf1714 Merge pull request #897 from BuhtigithuB/update-contrib/feedparser-py
Update gluon/contrib/feedparser.py from 5.1.2 -> 5.1.3
2015-04-02 16:23:34 -05:00
mdipierro e330791fe3 Merge pull request #894 from niphlod/fix/windows_build
fix windows build
2015-04-02 16:22:49 -05:00
mdipierro 5e1e97ffc4 Merge pull request #893 from niphlod/fix/duplicate_module
not needed anymore module
2015-04-02 16:20:39 -05:00
mdipierro 6b6cb5839c Merge branch 'master' of github.com:web2py/web2py 2015-04-01 13:55:07 -05:00
mdipierro 2a7e9c0c59 possible fix for issue #892 2015-04-01 13:54:48 -05:00
mdipierro 5b637c0a82 Merge pull request #891 from leonelcamara/cache_cleanup
Fixes issue with locked files during cleanup
2015-04-01 12:41:52 -05:00
mdipierro 0aade6b378 R-2.10.2 2015-03-31 22:26:25 -05:00
mdipierro 5b75130187 quick fix for cacheondisk problem and admin 2015-03-31 22:25:10 -05:00
mdipierro 2755354e2e fixed a problem with circular imports 2015-03-31 17:15:19 -05:00
mdipierro d088c622a7 fixed VERSION 2015-03-31 15:15:48 -05:00
mdipierro 70b0d67345 R-2.10.1 2015-03-31 14:57:40 -05:00
mdipierro 1b39736561 Merge branch 'master' of github.com:web2py/web2py 2015-03-31 14:45:59 -05:00
mdipierro 267175b947 Merge pull request #888 from BuhtigithuB/fix/pep8-utils-py
Improve PEP8 gluon/utils.py
2015-03-31 14:45:48 -05:00
mdipierro 70aa5136a6 Merge pull request #887 from BuhtigithuB/fix/pep8-validators-py
Improve PEP8 gluon/validators.py
2015-03-31 14:45:38 -05:00
mdipierro f036940ce1 Merge pull request #886 from BuhtigithuB/fix/pep8-widget-py
Improve PEP8 gluon/widget.py
2015-03-31 14:45:31 -05:00
mdipierro 42e2c150e7 Merge pull request #885 from BuhtigithuB/fix/pep8-tools-py
Improve PEP8 gluon/tools.py
2015-03-31 14:45:23 -05:00
mdipierro f5b0bff445 Merge branch 'master' of github.com:web2py/web2py 2015-03-30 01:26:20 -05:00
mdipierro f9c755bc18 Merge pull request #883 from BuhtigithuB/pep8-storage-py
Improve PEP8 gluon/storage.py
2015-03-30 01:26:06 -05:00
mdipierro 11a2ae36e6 Merge pull request #882 from leonelcamara/lock_disk
Finely grained lock disk
2015-03-30 01:25:55 -05:00
mdipierro 13897f00ad Merge branch 'master' of github.com:web2py/web2py 2015-03-29 18:07:29 -05:00
mdipierro 0c993db95f Merge pull request #880 from alimujtaba/master
check cmd_options existence before using it in restricted.py
2015-03-29 18:06:23 -05:00
mdipierro 7c4420aab2 Merge pull request #879 from ilvalle/fix-links
updated welcome menu with the 'Helping web2py' book chapter
2015-03-29 18:05:34 -05:00
mdipierro ba32ba7c62 Merge pull request #876 from bbertka/master
Added CF deployment script
2015-03-29 18:05:19 -05:00
mdipierro 5bf1eca384 Merge pull request #875 from amerikan/master
Made buttons and table look styled in appadmin
2015-03-29 18:05:02 -05:00
mdipierro f445619bee Merge pull request #874 from niphlod/welcome/bootstrap_update
bootstrap 3.3.4 is out...
2015-03-29 18:04:35 -05:00
mdipierro da162e0941 Merge pull request #873 from sp1d3rx/patch-1
Update ajax_examples.py so it does what it says.
2015-03-29 18:04:17 -05:00
mdipierro c63c91aa8a Merge pull request #872 from BuhtigithuB/pep8-sqlhtml-py
Improve PEP8 gluon/sqlhtml.py
2015-03-29 18:03:34 -05:00
mdipierro 0184d33e73 Merge branch 'master' of github.com:web2py/web2py 2015-03-24 11:40:28 -05:00
mdipierro bd899ea304 Merge pull request #870 from BuhtigithuB/pep8-shell-py
Improve PEP8 gluon/shell.py
2015-03-24 11:40:13 -05:00
mdipierro debd84e287 Merge pull request #871 from gi0baro/master
Track pyDAL 15.03
2015-03-24 11:39:42 -05:00
mdipierro fb902dd9ce throttling cache collection 2015-03-24 11:26:01 -05:00
mdipierro 3be7ff0532 Merge pull request #869 from BuhtigithuB/pep8-settings-py
Improve PEP8 gluon/settings.py
2015-03-23 10:47:25 -05:00
mdipierro 4f64ffb606 Merge pull request #868 from Kalmuraee/master
Arabic Translation Added
2015-03-23 10:47:13 -05:00
mdipierro e397ad5782 cache.ram.max_ram_utilization = 90 2015-03-22 19:16:29 -05:00
mdipierro ac78bf2f7d Merge pull request #867 from BuhtigithuB/pep8-scheduler-py
Improve PEP8 gluon/scheduler.py
2015-03-22 19:13:16 -05:00
mdipierro 438cdc809b used gluon/contrib/orderddict 2015-03-22 19:12:26 -05:00
mdipierro 3ea49739d3 expire cache when ram excees 90% 2015-03-22 13:40:05 -05:00
mdipierro 81fc9dbc6c Merge pull request #866 from BuhtigithuB/pep8-rocket-py
Improve PEP8 gluon/rocket.py
2015-03-22 12:59:34 -05:00
mdipierro e8357bff7f Merge pull request #863 from BuhtigithuB/pep8-rewrite-py
Improve PEP8 gluon/rewrite.py
2015-03-22 00:37:04 -05:00
mdipierro d7435a07ad Merge pull request #864 from niphlod/fix/redis_sessions
fixes issue with deleting sessions
2015-03-22 00:36:47 -05:00
mdipierro aa82638c3b Merge pull request #862 from niphlod/fix/issue679
fixes #679
2015-03-20 20:33:25 -05:00
mdipierro c30bffd2ae Merge pull request #861 from BuhtigithuB/pep8-recfile-py
Improve PEP8 gluon/recfile.py
2015-03-20 20:33:01 -05:00
mdipierro f27b9d7a23 following Niphlod's advice in app.example.yaml regex syntax 2015-03-20 18:39:19 -05:00
mdipierro ead8aab21e fixed app.example.yaml, thanks Niphlod 2015-03-20 18:13:03 -05:00
mdipierro 849177e09f adding pydal 15.03.20 2015-03-20 14:18:37 -05:00
mdipierro f1547486c0 fixed attachment on GAE 2015-03-20 13:34:43 -05:00
mdipierro 72d7b571de Merge pull request #860 from BuhtigithuB/pep8-newcron-py
Improve PEP8 gluon/newcron.py
2015-03-20 13:23:09 -05:00
mdipierro 3f6835f300 fixed issue #757, rss2 with weird chars (again) 2015-03-20 11:36:24 -05:00
mdipierro 133db9e3bb fixed issue #757, rss2 with weird chars 2015-03-20 11:18:18 -05:00
mdipierro daf371466a fixed issue #789, callable next 2015-03-20 11:05:15 -05:00
mdipierro 723c543f73 fixed issue #814, link to releases: 2015-03-20 11:00:53 -05:00
mdipierro 2a865a6f3e Merge pull request #859 from BuhtigithuB/pep8-myregex-py
Improve PEP8 gluon/myregex.py
2015-03-20 10:47:50 -05:00
mdipierro a56c1f37ed no more DAL and pyDAL 2015-03-20 09:11:24 -05:00
mdipierro 29b58ff70c added DAL serilization test 2015-03-20 01:35:55 -05:00
mdipierro 65b80d115a allow serialization of dal.py/DAL 2015-03-20 01:28:10 -05:00
mdipierro 385d47c5f0 Merge pull request #857 from gi0baro/pickle-issues
Removed representation utils from `_default_validators` method
2015-03-19 22:21:26 -05:00
mdipierro ce6b60c416 Merge pull request #856 from BuhtigithuB/pep8-main-py
Improve PEP8 gluon/main.py
2015-03-19 22:20:35 -05:00
mdipierro 023ee43245 minor changes to scrips and contrib 2015-03-19 12:22:21 -05:00
mdipierro a5097cdbc7 Merge pull request #853 from BuhtigithuB/pep8-languages-py
Improve PEP8 gluon/languages.py
2015-03-19 11:56:06 -05:00
mdipierro 109d104f3d removed broken links from menus 2015-03-19 11:54:32 -05:00
mdipierro 8de4fbf38f margin right 2015-03-18 18:32:10 -05:00
mdipierro dbe3951507 fixed checboxes and radio widgets 2015-03-18 18:28:38 -05:00
mdipierro f9212bc75e removed api collections json, fixed spilling list:string widget 2015-03-18 18:19:15 -05:00
mdipierro 058d6863a6 Merge pull request #854 from niphlod/fix/bs3
first iteration on bs3 cleanup
2015-03-18 18:13:21 -05:00
mdipierro 6c6cdd79f3 Merge pull request #855 from niphlod/fix/w2p_pack
Thanks Simone!
2015-03-18 18:10:53 -05:00
mdipierro 09eb7ce3b7 removed versioning in new welcome app 2015-03-17 16:56:47 -05:00
mdipierro d7e96ac114 fixed some style/layout issues, thanks Niphlod 2015-03-17 16:52:33 -05:00
mdipierro 2ff0f299da add remove static welcome files 2015-03-17 13:02:11 -05:00