dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,687 Commits 18 Branches 72 Tags
daf382c4fbc50995acaa7c3cdc34cedb9af48af0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mdipierro f76a780d50 fixed import of reserved_sql_keywords 2015-01-07 10:39:17 -06:00
mdipierro 15c3ac1cb9 fixed Makefile for new dal 2015-01-06 22:59:05 -06:00
mdipierro 83b94b8207 2.9.12-beta 2015-01-06 11:17:38 -06:00
mdipierro 261490c082 Merge pull request #581 from ShySec/master 
added support for POST variable passing to LOAD function
 2015-01-05 14:17:24 -06:00
mdipierro ef5913a519 Merge pull request #580 from ilvalle/fix_boolean_exp 
Fix expression evaluation with postgres
 2015-01-05 14:15:45 -06:00
mdipierro 997b877766 Merge pull request #579 from ilvalle/issue2003 
fix issue 2003: double translation
 2015-01-05 14:14:44 -06:00
mdipierro 354e63d0fe Merge pull request #577 from ilvalle/language 
fix issue 2011: capital letters in it.py
 2014-12-29 03:38:24 -06:00
mdipierro 1a85953325 Merge pull request #567 from kjkuan/fix-chunked-encoding-with-empty-body 
Fix the problem with chunked encoding with an empty body.
 2014-12-25 12:21:06 -06:00
mdipierro 3b655c4b71 Merge pull request #576 from niphlod/fix/readme_badges 
more consistent badges with shields.io
 2014-12-25 12:16:44 -06:00
mdipierro 675b7e356f Merge pull request #575 from reingart/master 
Fix incorrect namespace in SOAP webservice response
 2014-12-25 12:16:17 -06:00
mdipierro 1db3758980 Merge pull request #574 from ilvalle/fix-serialization 
fix issue 2027: bug in query serialization
 2014-12-25 12:15:17 -06:00
mdipierro 81fbc2ea2f Merge pull request #562 from timnyborg/patch-2 
Enable map_hyphen to work for application names
 2014-12-23 07:13:12 -06:00
mdipierro 3da506eec7 Merge pull request #572 from erikmontes/master 
class typo fix
 2014-12-23 07:11:35 -06:00
mdipierro 75a32a1cde Merge pull request #571 from niphlod/contrib/appconfig 
new module appconfig.py
 2014-12-22 22:32:35 -06:00
mdipierro 528c27f852 Merge pull request #570 from ilvalle/fix-stream 
fix issue 2029: response.stream bug with spaces in filename
 2014-12-22 22:31:57 -06:00
mdipierro c5f699ebad Merge pull request #569 from ilvalle/grid-search-fix 
fix issue 1931: preserve vars in grid search
 2014-12-22 22:31:13 -06:00
mdipierro 3c87c84578 Merge pull request #565 from niphlod/scheduler/enhancement 
better assignment (tasks go to not running workers only). Thanks @PengfeiYu
 2014-12-22 22:28:26 -06:00
mdipierro e92a581c73 Merge pull request #564 from ilvalle/issue-2024 
issue 2024 response.json sets default content-type to application/json
 2014-12-22 22:27:43 -06:00
mdipierro 28d07ef471 Merge pull request #563 from ilvalle/fix-cache 
fix cache clear with regex and tests
 2014-12-22 22:26:35 -06:00
mdipierro 687f9d0fd9 Merge pull request #559 from reingart/master 
Fix debugger interaction due new DAL
 2014-12-22 22:08:11 -06:00
mdipierro 3051135774 Merge pull request #558 from timnyborg/patch-1 
Update sqlhtml.py
 2014-12-22 22:06:48 -06:00
mdipierro 5ea654ed06 Merge pull request #554 from kjkuan/fix-circular-imports-take-2 
Make web2py's custom_import work with circular imports.
 2014-12-12 05:21:13 -06:00
mdipierro de55a729dc Merge pull request #557 from ilvalle/fileutils.py 
updated _extractall (python 2.4 support was dropped)
 2014-12-12 05:12:25 -06:00
mdipierro 199e719838 Merge pull request #556 from ilvalle/test_pack 
test for w2p_pack/w2p_unpack
 2014-12-12 05:11:15 -06:00
mdipierro 53e9e3b3e0 Merge pull request #555 from ilvalle/bigint 
Fix and initial tests for bigint
 2014-12-12 05:10:20 -06:00
mdipierro a97ec075da Merge branch 'ilvalle-test_pack' 2014-12-09 20:59:40 -06:00
mdipierro 4839df37e8 more tests, thanks Paolo 2014-12-09 20:59:26 -06:00
mdipierro 47165ed3b7 Merge pull request #551 from ilvalle/fix-searchgrid 
Fix search widget in SQLFORM.grid for SQLCustomType values
 2014-12-09 20:57:21 -06:00
mdipierro 654cb650fb Merge pull request #550 from ilvalle/fix-sqlcustomtype 
Fix NULL values with SQLCustomType
 2014-12-09 20:56:30 -06:00
mdipierro aaa17250d9 Merge pull request #549 from lminko/master 
added Burmese (Myanmar) localization to admin and welcome apps.
 2014-12-09 20:54:58 -06:00
mdipierro a1524d4da4 Merge pull request #547 from timrichardson/issues/2017 
Issues/2017
 2014-11-28 11:05:35 -06:00
mdipierro 3b9a5ee3b5 Merge pull request #546 from niphlod/fix/scheduler 
timeout = 0 leads to erratic behaviour.
 2014-11-28 11:04:52 -06:00
mdipierro 64e90a7250 Merge pull request #544 from niphlod/fix/2013 
fix issue with rname and oracle. Thanks @fernando. Fixes #2013
 2014-11-16 23:17:41 -06:00
mdipierro e36a1657fc Merge pull request #543 from AJDurant/master 
enable dropdown-toggle when user logged in
 2014-11-16 23:16:19 -06:00
mdipierro 58284e3674 Merge pull request #541 from ilvalle/show_if_readonly_form 
Added support for show_if in readonly sqlform (ex: sqlform.grid view )
 2014-11-16 23:15:37 -06:00
mdipierro 5a83c3e6b7 table callbacks panel in admin editor 2014-11-16 23:14:53 -06:00
mdipierro a22d5a4685 Merge pull request #539 from ilvalle/master 
table callbacks panel in admin editor
 2014-11-16 23:14:11 -06:00
mdipierro 9f405b2ab7 Merge branch 'master' of github.com:web2py/web2py 2014-11-09 09:31:49 -06:00
mdipierro e315db5cd8 Merge pull request #540 from niphlod/enhancement/js_norm_buttonname 
streamline behaviour of component (trapped) forms with multiple submit buttons
 2014-11-09 09:31:31 -06:00
mdipierro 67ba09af37 fixed data bug in hypermedia 2014-11-05 09:09:36 -06:00
mdipierro 894babaed3 Merge pull request #538 from niphlod/enhancement/scheduler 
update dependencies only if COMPLETED, allow to set status on a specific...
 2014-11-03 07:08:48 -06:00
mdipierro b906177efc Merge pull request #536 from henrynguyen7/patch-1 
Fixed missing update for new DAL structure
 2014-10-29 13:06:52 -05:00
mdipierro 7f1f6ae35f fixed heorku order of install, thanks Jay 2014-10-25 11:14:07 -05:00
mdipierro f299205869 Merge pull request #537 from btreecat/master 
Add option of using offical ibm_db_dbi driver instead of ODBC driver for DB2
 2014-10-24 17:27:57 -05:00
mdipierro fc19a4dd39 Merge pull request #535 from niphlod/fix/binaries_switch 
fix binaries build. thanks @David Ripplinger
 2014-10-22 21:29:52 -05:00
mdipierro ac53ef12e3 Merge pull request #534 from niphlod/fix/1998 
fixes issue 1998
 2014-10-22 21:29:15 -05:00
mdipierro a3a3936d3a Merge pull request #533 from jotbe/master 
Cleanup: Removed presumed debug print statement.
 2014-10-22 21:28:35 -05:00
mdipierro 8eef404e29 Merge branch 'niphlod-fix/pg8000' 2014-10-22 21:28:01 -05:00
mdipierro 50540b2f97 Merge branch 'fix/pg8000' of https://github.com/niphlod/web2py into niphlod-fix/pg8000 2014-10-22 21:26:59 -05:00
mdipierro 8ec68e393a Merge pull request #531 from leonelcamara/apostrophe_fpdf 
Fix for sanitize(''') returning ''' instead of '''
 2014-10-22 21:25:49 -05:00
mdipierro 274634a71a Merge branch 'leonelcamara-issue_1996_appadmin_cache_disk' 2014-10-18 15:22:43 -05:00
mdipierro 2b8add6778 merged 2014-10-18 15:21:41 -05:00
mdipierro ba374dea2c Merge pull request #528 from ilvalle/pg_rename 
renamed postgre.py into postgres.py, removed 2 overriding PG
 2014-10-18 15:18:40 -05:00
mdipierro 85a0e8f1b0 added space for testing 2014-10-18 15:09:53 -05:00
mdipierro 36010cb86e Merge pull request #527 from ilvalle/tests 
few more tests: gis functions, starts/endswith
 2014-10-18 11:41:22 -05:00
mdipierro bd05dc68ea Merge branch 'niphlod-enhancement/makefile_coverage' 2014-10-16 16:14:39 -05:00
mdipierro ab14cc626b Merge branch 'enhancement/makefile_coverage' of https://github.com/niphlod/web2py into niphlod-enhancement/makefile_coverage 2014-10-16 16:14:26 -05:00
mdipierro a2347f54d6 Merge branch 'niphlod-fix/ilike' 2014-10-16 16:13:44 -05:00
mdipierro 601e928438 Merge branch 'fix/ilike' of https://github.com/niphlod/web2py into niphlod-fix/ilike 2014-10-16 16:13:25 -05:00
mdipierro 9091a5af25 Merge pull request #525 from ilvalle/gitignore 
updated .gitignore for progress.log and temp directory
 2014-10-16 16:12:32 -05:00
mdipierro 8804a9ed77 Merge pull request #524 from niphlod/js/speed 
Waiting for a sane "prefixing", a much more efficient way to find errors
 2014-10-16 16:12:05 -05:00
mdipierro 99ddeb65fe Merge pull request #523 from niphlod/tests/languages_on_gae 
fix for GAE tests often failing for no apparent reason
 2014-10-16 16:11:39 -05:00
mdipierro ca1092efd3 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:09:38 -05:00
mdipierro f988f381f2 Merge pull request #522 from ilvalle/issue_1993 
fix issue 1993: git push in the admin console throw an error
 2014-10-16 16:09:10 -05:00
mdipierro ed25027499 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:08:36 -05:00
mdipierro 4892bbe0bd Merge pull request #521 from janknaupato/master 
Fix for issue 1932: Aggregrate function won't show up in SQLTABLE
 2014-10-16 16:08:33 -05:00
mdipierro 39dec30f52 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:07:54 -05:00
mdipierro 1f3030c75a Merge pull request #520 from niphlod/js/main_hook 
refactor main_hook to a function
 2014-10-16 16:07:47 -05:00
mdipierro 4211c38ac5 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:07:11 -05:00
mdipierro 0955bc0967 Merge pull request #519 from btreecat/master 
Fix DB2 Adapter for executesql and placeholders
 2014-10-16 16:07:03 -05:00
mdipierro ad5b9da4f4 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:05:35 -05:00
mdipierro 1c7153c985 Merge pull request #518 from gi0baro/dal-backward 
Added back DAL.Table for backward compatibility
 2014-10-16 16:05:32 -05:00
mdipierro 4448f01e47 Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:04:46 -05:00
mdipierro 297961739b Merge pull request #517 from ilvalle/master 
Added initial gis tests
 2014-10-16 16:04:36 -05:00
mdipierro 7aa703dc5e Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:03:51 -05:00
mdipierro eeb06ce14f Merge pull request #516 from leonelcamara/reset_password_key 
Change reset_password to send the password as GET query var instead of a...
 2014-10-16 16:02:36 -05:00
mdipierro 547ec7200e Merge branch 'master' of github.com:web2py/web2py 2014-10-16 16:01:57 -05:00
mdipierro 6cc55abc42 Merge pull request #513 from niphlod/docs/new_structure 
with dal new structure, API doc generation was left out of the picture. ...
 2014-10-16 15:59:04 -05:00
mdipierro d33091d76b added ssl option for tornado, thanks dmvieira 2014-10-16 15:58:57 -05:00
mdipierro e730b11b78 Merge pull request #512 from niphlod/issue/1980 
fixes issue 1980
 2014-10-16 15:48:55 -05:00
mdipierro 989a635dbb fixed conflict 2014-10-16 15:47:57 -05:00
mdipierro b36ab988cc updated scripts/setup-web2py-centos7.sh 2014-10-06 21:24:44 -05:00
mdipierro 05689aa526 another attempt at added ssl option for tornado #511 2014-09-30 09:38:00 -05:00
mdipierro 7c8d91d4c5 Merge pull request #486 from gi0baro/DAL-modular 
Added modular DAL, updated gluon imports to new structure
 2014-09-30 00:24:26 -05:00
mdipierro 47d9d47cff Merge pull request #510 from niphlod/fix/1985 
fixes issue 1985
 2014-09-29 19:46:01 -05:00
mdipierro ed4febf9db Merge pull request #509 from niphlod/fix/json_and_decimals 
always stringify decimals. Better docstrings and a few PEP8.
 2014-09-29 19:45:17 -05:00
mdipierro 78764072fe hooks panel in appadmin for _before_*/_after_* callbacksm thanks Paolo valleri 2014-09-29 19:40:56 -05:00
mdipierro eaf358765a Merge pull request #507 from ilvalle/master 
hooks panel in appadmin for _before_*/_after_* callbacks
 2014-09-29 19:39:41 -05:00
mdipierro 7b6f2bf896 Merge pull request #506 from niphlod/tests/html_and_serializers 
added tests for gluon/html.py and gluon/serializers.py
 2014-09-29 19:38:04 -05:00
mdipierro f17493b52c changed version number 2014-09-24 13:36:06 -05:00
mdipierro 4c45de7efd Merge pull request #505 from niphlod/fix/mssql3_mappings 
better types for mssql3://, given that we're on 2005 at least
 2014-09-24 13:35:08 -05:00
mdipierro c3f6fc8db8 Merge pull request #504 from niphlod/fix/storage_and_tests 
fix for StorageList and tests added
 2014-09-24 13:34:20 -05:00
mdipierro bb199ad533 Merge pull request #503 from niphlod/tests/validators 
improved coverage, fix bug with IS_LIST_OF and items not being strings
 2014-09-20 12:55:56 -05:00
mdipierro be07572572 Merge pull request #502 from niphlod/fix/cache_and_tests 
fix cache.increment, added tests
 2014-09-20 12:55:15 -05:00
mdipierro 424746ce7a R-2.9.11 2014-09-15 18:31:20 -05:00
mdipierro df234fa252 reverted simplejson 2014-09-15 18:30:37 -05:00
mdipierro 2b50cf27e2 R-2.9.10 2014-09-15 08:05:13 -05:00
mdipierro a38c7c2aa8 upgraded memcache and markdown2 2014-09-15 07:34:14 -05:00
mdipierro f0461ae84a upgraded pypyodbc.py 2014-09-14 16:41:47 -05:00
mdipierro 0120ad5b95 upgraded simplejson 2014-09-14 16:37:09 -05:00