dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,602 Commits 18 Branches 72 Tags
894babaed3c0ec50cb10d8a28ae3a80afbb95694
Commit Graph

5602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
niphlod
c071bc964b update dependencies only if COMPLETED, allow to set status on a specific worker 2014-10-30 21:54:36 +01: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
Stephen Tanner
41deff244c Allow URI for ibm_db_dbi driver to user lower or upper case params. 2014-10-24 15:28:59 -04:00
Henry Nguyen
7aa51fcbb0 Fixed missing update for new DAL structure 
Other values were updated in 5e5e649c28 but this was missing from that commit.
 2014-10-24 12:18:17 -07:00
Stephen Tanner
b9fe941dcc Modified DAL and DB2 adapter to allow use of the official ibm_db_dbi driver or ODBC. 2014-10-24 14:58:52 -04:00
Stephen Tanner
b7b94ca6b5 Merge pull request #1 from web2py/master 
Syncing with upstream.
 2014-10-24 14:35:48 -04: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
niphlod
98f245655b some freezers publish also __file__ in globals() 2014-10-22 22:04:52 +02:00
niphlod
fc38f460eb fixes issue 1998 2014-10-21 21:33:43 +02:00
Jan Beilicke
643748db02 Cleanup: Removed presumed debug print statement. 2014-10-21 15:56:21 +02: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
niphlod
794979abe1 pg8000 doesn't support json at all 2014-10-18 20:20:34 +02: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
Leonel Câmara
f10b1b93a9 fixed remaining methods in HTMLParser that were still using the old htmllib.HTMLParser interface 2014-10-18 13:05:27 +01:00
Leonel Câmara
b2401a5923 Fix for sanitize(''') returning ''' instead of ''' 2014-10-18 12:37:32 +01:00
Leonel Câmara
9d4b2e66c4 Fix for issue 1996 
This bug was caused by appadmin creating unnecessary files in the cache folder.
 2014-10-17 19:12:00 +01:00
ilvalle
9076971d75 renamed postgre.py into postgres.py, removed starts/ends with overriding in PG adapter 2014-10-17 17:56:54 +02:00
ilvalle
64ae27862a few more tests: gis functions, starts/endswith 2014-10-17 11:16:07 +02: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