dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,619 Commits 18 Branches 72 Tags
0b0f82b514b3c990fca8563fd48d162e130a959b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mdipierro e38565345c no more split in contains, thanks Niphlod 2014-09-14 16:01:47 -05:00
mdipierro b1180f483c Merge pull request #501 from niphlod/fix/dal_contains 
fixed bug on contains(), smart_query uses ilike instead of like
 2014-09-14 16:00:00 -05:00
mdipierro 75f2b90151 ilike, thanks Niphlod 2014-09-14 15:28:48 -05:00
mdipierro 6a75132d54 CROSS JOIN, thanks jotbe 2014-09-14 14:57:12 -05:00
mdipierro 3d9ebb5720 Merge pull request #497 from jotbe/master 
Fixed #1810: DAL.select(left=...) causes "Unknown column 't1.i1' in 'on ...
 2014-09-14 14:55:38 -05:00
mdipierro ec62375f6d Merge pull request #500 from niphlod/fix/postgresql_json 
postgresql: identifies what adapter auto-loads json values
 2014-09-14 14:53:45 -05:00
mdipierro f1ac5126a1 Merge pull request #499 from niphlod/tests/json_type 
added more tests for json Field
 2014-09-14 14:53:16 -05:00
mdipierro e4e9038ab6 Merge pull request #498 from encompass/master 
Improve the graphing to show the name of the application.
 2014-09-14 14:52:32 -05:00
mdipierro ce897b3569 added custom represent to GoogleDatastoreAdapter, thanks Alan 2014-09-14 11:58:16 -05:00
mdipierro b991f2926f fixed typo in driver_auto_json 2014-09-13 18:55:03 -05:00
mdipierro d81f4606db fixed mongodb json? 2014-09-13 10:35:54 -05:00
mdipierro d29a108ad7 better native_json naming convention 2014-09-12 20:28:46 -05:00
mdipierro 94a0b1aec5 fixed json field representation 2014-09-12 20:17:49 -05:00
mdipierro c2b1547802 Merge pull request #496 from rpedroso/reset_password_infinite_loop 
fix infinite loop in request_password
 2014-09-12 17:44:40 -05:00
mdipierro 0863bb3eca case insensitive autocomplete again 2014-09-12 11:36:26 -05:00
mdipierro 04c1064ab8 Merge pull request #494 from niphlod/fix/pickle_refactoring 
refactored pickling of sessions
 2014-09-11 21:13:47 -05:00
mdipierro cef7202781 fixed is_crypt in tools, thanks Anthony 2014-09-11 12:09:43 -05:00
mdipierro c3478f660a fixed pickling of session 2014-09-10 13:57:54 -05:00
mdipierro 09a44d41ae Merge pull request #493 from niphlod/fix/refactoring_pickle 
refactored pickle everywhere but Session, removed unused imports
 2014-09-10 12:27:34 -05:00
mdipierro 4740dc7cce Merge pull request #492 from niphlod/tests/storage_pickling 
added test for storage pickling
 2014-09-10 12:26:26 -05:00
mdipierro 463c5deac4 Merge pull request #491 from niphlod/fix/readme 
new structure in revised README
 2014-09-10 12:26:11 -05:00
mdipierro c3cd32cc4f possible fix to rss 2014-09-10 08:26:23 -05:00
mdipierro b98687239c ASSIGNJS 2014-09-08 19:18:55 -05:00
mdipierro 853beae9c6 R-2.9.9 2014-09-08 08:12:37 -05:00
mdipierro 94aab906d5 fixed serialization of Storage objects 2014-09-08 08:10:58 -05:00
mdipierro bb3909a944 Merge pull request #490 from ilvalle/grid-fix 
fix web2py.js with show_if and grid
 2014-09-08 08:02:44 -05:00
mdipierro 99087ab37a R-2.9.8 2014-09-06 23:09:44 -05:00
mdipierro 4bcd905f4f fixed appadmin/check_credentials problem 2014-09-06 22:57:26 -05:00
mdipierro 83bda542ad fixed opening get_session for new session files 2014-09-06 18:10:54 -05:00
mdipierro 1ea27f7f15 linked readthedocs 2014-09-05 16:47:20 -05:00
mdipierro 95b54857a3 fixed separator in trunk 2014-09-05 08:12:03 -05:00
mdipierro 327b1cbfdd R-2.9.7 2014-09-04 22:37:12 -05:00