Commit Graph

1341 Commits

Author SHA1 Message Date
Rafa de la Torre
0163700414 Fix merge conflict 2015-11-17 11:37:50 +00:00
Carla Iriberri
6d7156e309 Fixing conflicts 2015-11-17 12:35:07 +01:00
Carla Iriberri
c7b6db3560 Fixes IP address function naming and another CBD typo in postal codes 2015-11-17 12:26:18 +01:00
Rafa de la Torre
b977277052 cartodb as dependency and use its config table #37
in the client.
2015-11-17 12:01:18 +01:00
Carla Iriberri
7cba8fd679 Fixes cdb typo in out 2015-11-17 11:50:16 +01:00
Carla
35ed467c69 Update 50_ipaddresses_test.out 2015-11-17 11:36:13 +01:00
Carla
74fd173e63 Update 50_ipaddresses_test.sql 2015-11-17 11:35:12 +01:00
Rafa de la Torre
7d9060d09a Merge branch 'review_internal_api' of github.com:CartoDB/geocoder-api into review_internal_api 2015-11-17 11:30:33 +01:00
Carla Iriberri
199a7ed905 Fixing adm0 plural naming and cdb typos in NOTICE messages 2015-11-17 11:30:25 +01:00
Rafa de la Torre
531e28f11b Merge remote-tracking branch 'origin/master' into review_internal_api 2015-11-17 11:26:45 +01:00
Rafa de la Torre
569eb68ef0 Merge pull request #36 from CartoDB/revert-33-add-cartodb-dependency
Revert "Adds cartodb dependency"
2015-11-17 11:12:37 +01:00
Rafa de la Torre
a2c2903d76 Revert "Adds cartodb dependency" 2015-11-17 11:12:31 +01:00
Carla
30c02dd053 typo cbd 2015-11-17 10:20:31 +01:00
Carla
77d5c37717 typo cbd 2015-11-17 10:20:12 +01:00
Carla
5d7cfa9053 Update 10_admin0_test.sql 2015-11-17 10:19:48 +01:00
Rafa de la Torre
84b7585552 Merge pull request #33 from CartoDB/add-cartodb-dependency
Adds cartodb dependency
2015-11-17 09:48:20 +01:00
Guido Fioravantti
dbeef1bfb4 Fixes dependency misplacement 2015-11-16 18:01:52 +01:00
Guido Fioravantti
80f75d3d56 Adds cartodb dependency 2015-11-16 17:56:40 +01:00
Rafa de la Torre
20fa7da928 Merge pull request #28 from CartoDB/implementing_client_functions
Implementing client functions
2015-11-16 14:48:41 +01:00
Carla
48201acbb1 Update API.md 2015-11-13 16:32:49 +01:00
Carla
96b40d5184 Update API.md 2015-11-13 16:29:57 +01:00
Carla
bf1afa51b6 Update API.md 2015-11-13 16:20:13 +01:00
Carla
b74c9f4311 Update API.md 2015-11-13 16:13:47 +01:00
Carla
0111fddfeb Update API.md 2015-11-13 16:12:32 +01:00
Carla
50826ca8db Update API.md 2015-11-13 16:11:38 +01:00
Carla
81093155ab Update API.md 2015-11-13 16:06:18 +01:00
Carla
4445bc5b1a Update API.md 2015-11-13 16:04:11 +01:00
Carla
900ca6002d Update API.md 2015-11-13 16:01:44 +01:00
Carla
e7f2a71c48 Update API.md 2015-11-13 15:46:26 +01:00
Carla
cbbd58d5d0 Update API.md 2015-11-13 15:22:00 +01:00
Carla
f18feb4bc0 Update API.md 2015-11-13 15:00:39 +01:00
Carla
78ce076c81 Update API.md 2015-11-13 14:59:45 +01:00
Carla
2cde9f0d47 Update API.md 2015-11-13 14:59:07 +01:00
Carla Iriberri
8fcc84b462 Adding docs 2015-11-13 14:52:56 +01:00
Carla Iriberri
91fab99084 Uses proper postalcode functions and tests 2015-11-13 13:04:46 +01:00
Carla Iriberri
50d1f502f7 Adds permissions and their tests 2015-11-13 12:32:36 +01:00
Carla Iriberri
5226af7c86 Adds client functions for named places, pcodes and ips 2015-11-12 18:45:27 +01:00
Rafa de la Torre
05d75c82ee Merge pull request #25 from CartoDB/add-config-table-and-funcs
Config table and functions for server extension
2015-11-12 17:04:26 +01:00
Carla Iriberri
d5268ee4ad Adds functions for admin1 2015-11-12 15:06:17 +01:00
Rafa de la Torre
cb83bff306 Merge pull request #24 from CartoDB/remove_double_tests_namedplaces
Removes double tests for namedplaces
2015-11-12 13:09:34 +01:00
Rafa de la Torre
b45aba4278 Config table and functions for server extension
Pretty much as done in cartodb and client extensions.
2015-11-12 13:02:51 +01:00
Carla Iriberri
e3269af48f Removes double tests for namedplaces 2015-11-12 12:49:54 +01:00
Rafa de la Torre
6efebdc668 Merge pull request #23 from CartoDB/add-missing-functions
Add missing functions
2015-11-12 12:27:31 +01:00
Guido Fioravantti
c1d4ffb37a Exception typo 2015-11-12 12:11:05 +01:00
Guido Fioravantti
ff3f5a1f4c Removes unnecessary arrays 2015-11-12 12:07:15 +01:00
Guido Fioravantti
2afb541d8d Fix indentation 2015-11-12 11:58:32 +01:00
Guido Fioravantti
4ba76df016 Improves ip query 2015-11-12 11:57:28 +01:00
Carla Iriberri
e830134ec5 Revert "Adding tests"
This reverts commit 3f6df14fc7.
2015-11-12 11:53:29 +01:00
Carla Iriberri
1216e58120 Editing test output 2015-11-12 11:47:22 +01:00
Guido Fioravantti
84f45f82b4 Typo in .gitignore 2015-11-12 11:40:51 +01:00