dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,124 Commits 18 Branches 72 Tags
66d15491ca4ceb5e2b8a90d4bfa70277aa5f3c76
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mdipierro 66d15491ca Merge pull request #984 from ilvalle/minorfix 
lazy request.uuid
 2015-05-28 23:17:21 -05:00
mdipierro 376a27da73 Merge pull request #983 from Euphorbium/patch-1 
fix cPickle not defined error
 2015-05-28 23:16:33 -05:00
mdipierro 0f95c13dc7 Merge pull request #981 from gi0baro/master 
Track pyDAL 15.05.26
 2015-05-28 23:16:02 -05:00
mdipierro 926de90ee4 fixed bug in orderby when it is a list 2015-05-28 13:59:03 -05:00
mdipierro 1e66fa3a93 new version number 2015-05-24 19:14:49 -05:00
mdipierro 57a8dfe034 Merge pull request #977 from austinprog/patch-1 
Changed "Import about this GIT repo" Line 16, typo
 2015-05-24 18:58:22 -05:00
mdipierro 77e7631740 Merge pull request #976 from niphlod/fix/ubuntu_nginx_hardening 
thanks  @wmunguiam for spotting
 2015-05-24 18:57:51 -05:00
mdipierro ba978d55cf Merge pull request #975 from gi0baro/master 
Track pyDAL 15.05
 2015-05-24 18:57:36 -05:00
mdipierro 12e8ee5c25 Merge pull request #974 from niphlod/fix/redis_cache_multiapp 
redis multi-app. Thanks Lisandro for spotting it
 2015-05-24 18:57:26 -05:00
mdipierro c7d3758c77 Merge pull request #973 from omniavx/patch-1 
Update dal.py
 2015-05-20 08:27:41 -05:00
mdipierro 040e52278e Merge pull request #956 from cassiobotaro/master 
More changes in List (request.args)
 2015-05-20 08:27:16 -05:00
mdipierro 3daf953c66 syncing maintenance again 2015-05-20 08:26:03 -05:00
mdipierro de3d722ac9 fixed import, thanks Auden RovelleQuartz 2015-05-20 08:24:33 -05:00
mdipierro eb4d159b37 fixed process_batch_upload 2015-05-18 23:28:17 -05:00
mdipierro 76cfba7047 Merge pull request #964 from matclab/mail-send-lazy-to-unicode 
#963 : Convert subject and body to unicode before sending mail
 2015-05-14 09:17:04 -05:00
mdipierro f77f307869 Merge pull request #970 from ailnlv/patch-1 
Fixing https://github.com/web2py/web2py/issues/969
 2015-05-14 09:16:52 -05:00
mdipierro 5ef8648929 Merge pull request #967 from bletourmy/fix/966 
fixes #966 - deadlock in cache.disk
 2015-05-14 09:16:31 -05:00
mdipierro ed042685ea Merge pull request #965 from niphlod/fix/962 
fixes #962
 2015-05-14 09:16:10 -05:00
mdipierro d09ce57f12 Merge pull request #961 from niphlod/fix/628 
fixes #628
 2015-05-14 09:14:06 -05:00
mdipierro 587ff56a94 linked 15.03-maintenance again 2015-05-07 22:26:42 -05:00
mdipierro 6f91fdd833 minor refactoring in grid(orderby) 2015-05-06 08:56:56 -05:00
mdipierro 6e2f9ad043 fixed examples support 2015-05-04 11:23:44 -05:00
mdipierro f45bf73992 Merge branch 'master' of github.com:web2py/web2py 2015-05-03 16:42:42 -05:00
mdipierro 94461724f6 Merge pull request #954 from cassiobotaro/master 
Mantain backward compatibility
 2015-05-03 16:42:12 -05:00
mdipierro 99fb1c3010 Merge branch 'master' of github.com:web2py/web2py 2015-05-03 10:31:37 -05:00
mdipierro 20067d7b93 Merge pull request #953 from niphlod/fix/691 
fixes issue #691
 2015-05-03 10:31:32 -05:00
mdipierro 44eb35c617 Merge pull request #952 from niphlod/fix/734 
fixes #734
 2015-05-03 10:31:21 -05:00
mdipierro df03317054 Merge pull request #951 from niphlod/tests/cache_ram_and_disk 
more tests, general cleanup
 2015-05-03 10:31:08 -05:00
mdipierro 9d873cbd1c reverted last commit 2015-05-03 10:30:43 -05:00
mdipierro 1bb4117cbd Merge pull request #950 from cassiobotaro/master 
Fix List behaviour and added new feature
 2015-05-03 10:27:46 -05:00
mdipierro e834186a86 Merge pull request #950 from cassiobotaro/master 
Fix List behaviour and added new feature
 2015-05-03 10:23:08 -05:00
mdipierro 1394942feb removed reference to python 2.5 2015-05-03 10:09:07 -05:00
mdipierro 9b12459a82 Merge branch 'master' of github.com:web2py/web2py 2015-05-02 23:16:12 -05:00
mdipierro 8e3925820c allow disabling of confirmation in js delete 2015-05-02 23:16:05 -05:00
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