Commit Graph

1019 Commits

Author SHA1 Message Date
Rafa de la Torre
638794c3a4 Merge branch 'develop' into QLIK 2016-04-14 10:34:36 +02:00
John Krauss
e194e91f78 Merge remote-tracking branch 'origin/QLIK' into QLIK 2016-04-13 16:11:45 -04:00
John Krauss
384a63b8a2 fixing bug with segments pulling at wrong geom level by default 2016-04-13 16:11:26 -04:00
Andy Eschbacher
9726053dd6 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 15:54:42 -04:00
Andy Eschbacher
9a398530b3 addding expected results 2016-04-13 15:54:30 -04:00
John Krauss
97f73b11e0 removing pop_5_years_and_over that is missing from block group, stub out land_area 2016-04-13 15:41:47 -04:00
Stuart Lynn
6ee0b99bd4 Fixing overlapping point issue 2016-04-13 15:10:14 -04:00
John Krauss
38a784b15c bring back lost obs_getcolumndata work from 94169e6874f2a79f2b6ed4d58ad0fd542a4ec64e 2016-04-13 14:07:28 -04:00
Rafa de la Torre
a5be765639 Ignore just a dir called (not a file) 2016-04-13 18:35:34 +02:00
Rafa de la Torre
8438e19b96 Merge pull request #10 from CartoDB/extension-scaffolding-fixes
Extension scaffolding fixes
2016-04-13 18:32:43 +02:00
Rafa de la Torre
c35c453c25 Add plpythonu to install test
Add `plpythonu` extension as it's a dependency to `cartodb` extension.
2016-04-13 18:17:23 +02:00
Rafa de la Torre
2f4f9412b0 Ignore test results directory
Ignore contents of directory produced by `make test`.
2016-04-13 18:16:35 +02:00
Rafa de la Torre
0c813d081c Ignore develop artifacts
Ignore artifacts produced by `sudo make install`.
2016-04-13 18:15:19 +02:00
Andy Eschbacher
ea183c7447 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 11:54:25 -04:00
Andy Eschbacher
7466840148 adding table for testing 2016-04-13 11:54:05 -04:00
Andy Eschbacher
04ab761e21 fix table's schema 2016-04-13 11:52:44 -04:00
Rafa de la Torre
8e13591309 Merge pull request #9 from CartoDB/develop-doc-fixes
Develop doc fixes
2016-04-13 17:36:46 +02:00
John Krauss
c119a66fea segment should default to census tract 2016-04-13 11:28:56 -04:00
Rafa de la Torre
554c566d19 Some small readability improvements 2016-04-13 17:25:22 +02:00
Rafa de la Torre
6974c99a9b Fix relative links in markdown 2016-04-13 17:20:46 +02:00
John Krauss
ceac78ecd8 remove block-group incompatible quantile cols 2016-04-13 11:19:45 -04:00
Stuart Lynn
69bd3b2605 Merge branch 'QLIK' of github.com:CartoDB/observatory-extension into QLIK 2016-04-13 11:17:27 -04:00
Rafa de la Torre
e37f5afdab Minor doc improvements (code org) 2016-04-13 17:13:04 +02:00
Stuart Lynn
346f381a9c Adding defaults to the OBS_GETDEMOGRAPHICSNAPSHOT 2016-04-13 11:12:29 -04:00
John Krauss
a929f2902e go back to using block_group for demographicsnapshot etc 2016-04-13 11:08:41 -04:00
Rafa de la Torre
bc584f810a Remove references to python 2016-04-13 17:06:27 +02:00
John Krauss
d14ff607d3 Merge remote-tracking branch 'origin/QLIK' into QLIK 2016-04-13 11:00:34 -04:00
John Krauss
73300b6537 add missing high-income column 2016-04-13 11:00:26 -04:00
Andy Eschbacher
38e20df08b fixing return keyword error 2016-04-13 10:46:28 -04:00
Andy Eschbacher
c051fcca61 updated based on latest metadata 2016-04-13 10:43:59 -04:00
John Krauss
e89582aed5 remove columns from demographicsnapshot that do not appear at BG level 2016-04-13 10:35:53 -04:00
Andy Eschbacher
466554a139 formatting updates 2016-04-13 09:51:31 -04:00
Andy Eschbacher
044e83a40f removing unneeded comments 2016-04-13 09:33:25 -04:00
Andy Eschbacher
d01bfe7900 Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-13 09:31:35 -04:00
Andy Eschbacher
255d13cc77 replacing exceptions with notices; returning nulls 2016-04-13 09:31:19 -04:00
Andrew W. Hill
cce3881e97 Update API.md 2016-04-12 17:18:17 -04:00
Stuart Lynn
0f588452e0 Merge branch 'QLIK' of github.com:CartoDB/observatory-extension into QLIK 2016-04-12 16:57:05 -04:00
Stuart Lynn
3808ecdbce bug fixes that didn't get carried over 2016-04-12 16:56:42 -04:00
Andy Eschbacher
4892f73bab Merge branch 'QLIK' of https://github.com/CartoDB/observatory-extension into QLIK 2016-04-12 16:13:09 -04:00
Andy Eschbacher
f9e262b210 updated to create tables to specif schema 2016-04-12 16:10:01 -04:00
Stuart Lynn
390ac27425 updating column names 2016-04-12 15:44:33 -04:00
Andy Eschbacher
80b117bd2f adding metadata data sources for tests 2016-04-12 12:59:18 -04:00
Andy Eschbacher
b1cefd8f73 fixing install test 2016-04-12 11:52:24 -04:00
andrewxhill
5511365ca7 added demographics attribute table 2016-04-11 18:32:14 -04:00
John Krauss
2a7ce24a40 Merge remote-tracking branch 'origin/qlik' into QLIK 2016-04-11 18:21:19 -04:00
John Krauss
5abb354d7d bugfix 2016-04-11 18:21:08 -04:00
John Krauss
5d9571a954 use sq km, do not filter by bounds, add segment function 2016-04-11 17:54:47 -04:00
andrewxhill
5f7fc83638 added geo scope 2016-04-11 17:16:34 -04:00
andrewxhill
171309261a added field desc 2016-04-11 17:13:00 -04:00
andrewxhill
2cb50eea9c matched the api doc file naming to other repos 2016-04-11 16:50:25 -04:00