Raul Ochoa
|
fbc1bccb48
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
|
2016-01-18 14:32:33 +01:00 |
|
Raul Ochoa
|
b5b881e662
|
Regenerate npm-shrinkwrap.json
|
2016-01-18 14:24:23 +01:00 |
|
Raul Ochoa
|
5eeaa0272c
|
Use master branch from windshaft and regenerate npm-shrinkwrap.json
|
2016-01-15 16:01:01 +01:00 |
|
Raul Ochoa
|
ad566d8ff0
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-24 13:36:39 +01:00 |
|
Raul Ochoa
|
67ba517a0e
|
Stubs next version
|
2015-11-23 16:08:32 +01:00 |
|
Raul Ochoa
|
152440e611
|
Upgrade windshaft to 1.6.1
Regenerates npm-shrinkwrap.json, including bump in torque.js@2.11.4
|
2015-11-23 15:51:57 +01:00 |
|
Raul Ochoa
|
0a38549c55
|
Regenerate npm-shrinkwrap.json
|
2015-11-23 11:00:55 +01:00 |
|
Raul Ochoa
|
37ff13493c
|
Use mapconfig-extension from windshaft
|
2015-11-16 12:23:05 +01:00 |
|
Raul Ochoa
|
9264f4a668
|
Re-adds npm-shrinkwrap.json
|
2015-11-16 12:13:54 +01:00 |
|
Raul Ochoa
|
4c851a0d09
|
Remove npm-shrinkwrap.json to ease development
|
2015-11-13 10:35:30 +01:00 |
|
Raul Ochoa
|
86abc392a1
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-12 11:38:42 +01:00 |
|
Raul Ochoa
|
9e00cb3309
|
Stubs next version
|
2015-11-12 11:30:58 +01:00 |
|
Raul Ochoa
|
3dbcf5f293
|
Upgrade windshaft/mapnik
|
2015-11-11 16:28:21 +01:00 |
|
Raul Ochoa
|
663703abae
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-02 11:13:34 +01:00 |
|
Raul Ochoa
|
5844c031c9
|
Stubs next version
|
2015-11-02 10:55:57 +01:00 |
|
Raul Ochoa
|
479861e612
|
Update news
|
2015-10-29 18:31:15 +01:00 |
|
Raul Ochoa
|
a746445b88
|
Upgrade windshaft to 1.5.0
|
2015-10-29 18:30:02 +01:00 |
|
Raul Ochoa
|
3b9759d5e4
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-28 19:41:44 +01:00 |
|
Raul Ochoa
|
a20a1f692b
|
Stubs next version
|
2015-10-28 19:27:53 +01:00 |
|
Raul Ochoa
|
ee39450864
|
Regenerate npm-shrinkwrap.json
|
2015-10-28 19:21:22 +01:00 |
|
Raul Ochoa
|
3fa4f8573e
|
Upgrades windshaft to 1.3.0
|
2015-10-28 16:31:11 +01:00 |
|
Raul Ochoa
|
50e63bf83d
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-26 17:06:13 +01:00 |
|
Raul Ochoa
|
2f592e6f62
|
Stubs next version
|
2015-10-22 16:28:49 +02:00 |
|
Raul Ochoa
|
d7181ec6c2
|
Upgrades windshaft to 1.2.0
|
2015-10-21 18:38:19 +02:00 |
|
Raul Ochoa
|
7761f56d36
|
Stubs next version
|
2015-10-21 13:58:26 +02:00 |
|
Raul Ochoa
|
12175f10a6
|
Upgrades windshaft to 1.1.1
|
2015-10-21 13:55:36 +02:00 |
|
Raul Ochoa
|
52dbe14af2
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-13 16:06:04 +02:00 |
|
Raul Ochoa
|
01bd09040e
|
Stubs next version
|
2015-10-13 12:44:29 +02:00 |
|
Raul Ochoa
|
6effcfb62e
|
Upgrades windshaft to 1.1.0 and fastly-purge to 1.0.1
|
2015-10-09 15:50:39 +02:00 |
|
Raul Ochoa
|
59fb1dea54
|
Start using mapconfig-extension branch from windshaft
|
2015-10-06 18:55:27 +02:00 |
|
Raul Ochoa
|
2cc4cc5deb
|
Stubs next version
|
2015-09-30 19:26:33 +02:00 |
|
Raul Ochoa
|
e7aa6bbdf9
|
Upgrade windshaft
|
2015-09-30 17:44:40 +02:00 |
|
Raul Ochoa
|
ba6b8fbff1
|
Stubs next version
|
2015-09-30 11:28:38 +02:00 |
|
Raul Ochoa
|
ff561157ac
|
Use Windshaft from registry
|
2015-09-30 11:21:25 +02:00 |
|
Raul Ochoa
|
a7cf9fd74f
|
Regenerate npm-shrinkwrap.json
|
2015-09-30 11:04:40 +02:00 |
|
Raul Ochoa
|
f9e3870941
|
Update news with all changes related to use Windshaft as library
|
2015-09-30 00:59:42 +02:00 |
|
Raul Ochoa
|
6a38defac5
|
Use Windshaft master branch
|
2015-09-29 19:42:13 +02:00 |
|
Raul Ochoa
|
8dca835a8e
|
Regenerate npm-shrinkwrap.json
|
2015-09-29 12:58:48 +02:00 |
|
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
|
77a5b70576
|
Update news and bump version
|
2015-09-21 22:43:33 +02:00 |
|
Raul Ochoa
|
486cafba9d
|
re-generate npm-shrinkwrap.json
|
2015-09-18 03:06:26 +02:00 |
|
Raul Ochoa
|
e9e95eda0a
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-18 02:31:38 +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
|
beabe48aec
|
Upgrade express, adds body-parser
- basic changes in server
- basic changes in unit tests
|
2015-09-17 00:19:00 +02:00 |
|
Raul Ochoa
|
a176ddbf3f
|
Regenerate npm-shrinkwrap.json
|
2015-09-16 13:25:57 +02:00 |
|
Raul Ochoa
|
1c6571d1db
|
Upgrade dependencies and regenerate npm-shrinkwrap.json
Surrogate keys tests sleeping :-(
|
2015-09-16 13:17:03 +02:00 |
|