Raul Ochoa
|
17458f3f4e
|
Use windshaft's backend-foundations branch as it already has mvt support
|
2015-09-22 14:13:09 +02:00 |
|
Raul Ochoa
|
e87fc8a839
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-22 12:28:16 +02:00 |
|
Raul Ochoa
|
6cf4d53b7c
|
Merge branch 'master' into standalone-server
Conflicts:
lib/cartodb/controllers/named_static_maps.js
|
2015-09-21 23:55:17 +02:00 |
|
Raul Ochoa
|
619545b993
|
Stubs next version
|
2015-09-21 22:49:06 +02:00 |
|
Raul Ochoa
|
e75d17f0e1
|
Release 2.13.0
|
2015-09-21 22:45:50 +02:00 |
|
Raul Ochoa
|
77a5b70576
|
Update news and bump version
|
2015-09-21 22:43:33 +02:00 |
|
Raul Ochoa
|
59b0a00c6f
|
Merge pull request #332 from CartoDB/static-namedmaps-x-cache
Keep x-cache-channel in named map static maps
|
2015-09-21 22:40:42 +02:00 |
|
Raul Ochoa
|
5d24da4f2b
|
Keep x-cache-channel in named map static maps
|
2015-09-21 22:36:13 +02:00 |
|
Raul Ochoa
|
0d3e96ee9f
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-18 17:23:58 +02:00 |
|
Raul Ochoa
|
16480a6c44
|
log as warn
|
2015-09-18 17:23:37 +02:00 |
|
Raul Ochoa
|
813a59a36e
|
Removes function from control flow
|
2015-09-18 17:16:30 +02:00 |
|
Raul Ochoa
|
23fd33030d
|
remove console.log
|
2015-09-18 17:13:37 +02:00 |
|
Raul Ochoa
|
2bdce4baa7
|
Replaces console.log with global logger
|
2015-09-18 17:13:22 +02:00 |
|
Raul Ochoa
|
d2df0b7c84
|
Configure log4js in test environment so it doesn't output by default
|
2015-09-18 16:59:45 +02:00 |
|
Raul Ochoa
|
16468b1216
|
remove console.log
|
2015-09-18 16:45:35 +02:00 |
|
Raul Ochoa
|
3abdee5e87
|
use debug for corner case
|
2015-09-18 16:40:55 +02:00 |
|
Raul Ochoa
|
d69a69da94
|
remove console.log
|
2015-09-18 16:39:52 +02:00 |
|
Raul Ochoa
|
bc806bba34
|
remove console.log
|
2015-09-18 16:39:30 +02:00 |
|
Raul Ochoa
|
81081ba2d4
|
Remove console.log from test
|
2015-09-18 16:26:54 +02:00 |
|
Raul Ochoa
|
5ad567803d
|
Set backlog on server listen
|
2015-09-18 16:25:10 +02:00 |
|
Raul Ochoa
|
486cafba9d
|
re-generate npm-shrinkwrap.json
|
2015-09-18 03:06:26 +02:00 |
|
Raul Ochoa
|
c0a1119d1d
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-18 02:58:39 +02:00 |
|
Raul Ochoa
|
bd4894ebd3
|
Starts modifying readme
|
2015-09-18 02:58:16 +02:00 |
|
Raul Ochoa
|
e9e95eda0a
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-18 02:31:38 +02:00 |
|
Raul Ochoa
|
1b3f1ba2e8
|
Merge pull request #331 from CartoDB/standalone-server-express-4
Upgrade express to 4.x
|
2015-09-18 02:09:23 +02:00 |
|
Raul Ochoa
|
5e27f981de
|
Regenerate npm-shrinkwrap.json
|
2015-09-18 01:58:47 +02:00 |
|
Raul Ochoa
|
c97f78bb39
|
Merge branch 'standalone-server' into standalone-server-mvt
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-09-18 01:34:14 +02:00 |
|
Raul Ochoa
|
f7b1032b7a
|
Do not fail for now if there are pending keys in redis
|
2015-09-17 18:24:12 +02:00 |
|
Raul Ochoa
|
7ee2649feb
|
Remove redis keys having in mind last updated time
|
2015-09-17 18:12:45 +02:00 |
|
Raul Ochoa
|
281320f2c4
|
use 127.0.0.1 instead of localhost
|
2015-09-17 17:51:34 +02:00 |
|
Raul Ochoa
|
30f7c74aee
|
Reenable external resources tests using 127.0.0.1
|
2015-09-17 17:36:23 +02:00 |
|
Raul Ochoa
|
2dfd7257dd
|
Try to run in travis with external resources disabled
|
2015-09-17 17:19:31 +02:00 |
|
Raul Ochoa
|
1f9dd5fd8c
|
re-enable nock after every suite
|
2015-09-17 17:14:32 +02:00 |
|
Raul Ochoa
|
dd83c05a89
|
restore nock globally after each suite
|
2015-09-17 15:10:23 +02:00 |
|
Raul Ochoa
|
30cba053da
|
Check there is no unexepcted keys on redis after tests
|
2015-09-17 15:07:54 +02:00 |
|
Raul Ochoa
|
5428d3f0b0
|
Remove __dirname
|
2015-09-17 13:58:45 +02:00 |
|
Raul Ochoa
|
95398354e3
|
require test helper
|
2015-09-17 13:58:22 +02:00 |
|
Raul Ochoa
|
7e73216539
|
Remove unused variables
|
2015-09-17 13:44:37 +02:00 |
|
Raul Ochoa
|
bbac1df463
|
Moves acceptance test about statsd uncaugth exception to integration
|
2015-09-17 13:40:01 +02:00 |
|
Raul Ochoa
|
208dd209a4
|
Merge branch 'standalone-server' into standalone-server-express-4
Conflicts:
lib/cartodb/controllers/base.js
|
2015-09-17 12:57:33 +02:00 |
|
Raul Ochoa
|
9139feaa30
|
Move error message handling test to unit
|
2015-09-17 12:48:29 +02:00 |
|
Raul Ochoa
|
f9f6c8b700
|
Use debug instead of console
|
2015-09-17 12:03:58 +02:00 |
|
Raul Ochoa
|
db8457af60
|
status + send on syntax error handler
|
2015-09-17 11:07:02 +02:00 |
|
Raul Ochoa
|
361dd00e9d
|
Use debug instead of console
|
2015-09-17 11:06:46 +02:00 |
|
Raul Ochoa
|
7fd870cfd2
|
Rewrite assert.response using request module
|
2015-09-17 02:06:46 +02:00 |
|
Raul Ochoa
|
967ef99277
|
Fix jsonp tests
|
2015-09-17 02:06:32 +02:00 |
|
Raul Ochoa
|
d93abe8e7d
|
Change to delete
|
2015-09-17 02:05:47 +02:00 |
|
Raul Ochoa
|
a4ba21f9db
|
Call send with correct params
|
2015-09-17 02:05:25 +02:00 |
|
Raul Ochoa
|
feabb20748
|
Send depending on body type
|
2015-09-17 02:04:30 +02:00 |
|
Raul Ochoa
|
31fe06e3ce
|
Use listener and remove etag
|
2015-09-17 02:04:10 +02:00 |
|