Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed remainings of old merge | slomo | 2011-01-21 | 1 | -19/+0 |
| | |||||
* | merged again | slomo | 2011-01-21 | 1 | -11/+6 |
|\ | |||||
| * | removed old code | Mark Engel | 2011-01-21 | 1 | -29/+3 |
| | | |||||
* | | fixed confilicts | slomo | 2011-01-21 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:slomo/osm-spline-xapi | slomo | 2011-01-21 | 1 | -4/+1 |
|\| | |||||
| * | typo | Mark Engel | 2011-01-21 | 1 | -4/+1 |
| | | |||||
* | | replaced consol logs with log4js | slomo | 2011-01-21 | 1 | -15/+15 |
|/ | |||||
* | Merge branch 'master' of github.com:slomo/osm-spline-xapi | Mark Engel | 2011-01-21 | 1 | -162/+170 |
|\ | | | | | | | | | Conflicts: src/nodejs/no1.js | ||||
| * | fixed codelayout | Alexander Sulfrian | 2011-01-21 | 1 | -182/+180 |
| | | |||||
| * | Merge branch 'master', remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 0 | -0/+0 |
| | | |||||
* | | refactored creation of rows to xml into own function | Mark Engel | 2011-01-21 | 1 | -17/+21 |
|/ | |||||
* | Merge branch 'master' of github.com:slomo/osm-spline-xapi | Mark Engel | 2011-01-21 | 1 | -24/+40 |
|\ | | | | | | | | | Conflicts: src/nodejs/no1.js | ||||
| * | Merge branch 'master', remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 2 | -15/+24 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:slomo/osm-spline-xapi | slomo | 2011-01-21 | 1 | -32/+23 |
| | |\ | |||||
| | * | | added log4js | slomo | 2011-01-21 | 2 | -15/+24 |
| | | | | |||||
| * | | | removed trailing whitespaces | Alexander Sulfrian | 2011-01-21 | 1 | -19/+19 |
| | | | | |||||
| * | | | Merge branch 'master', remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 3 | -139/+37 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | removed old files | Alexander Sulfrian | 2011-01-21 | 1 | -107/+0 |
| | | | | |||||
| * | | | Merge branch 'master' of git://github.com/slomo/osm-spline-xapi | Alexander Sulfrian | 2011-01-21 | 2 | -1/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 6 | -61/+324 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'de2719e8d5841abce7933ea20878de79203193dd' | Alexander Sulfrian | 2011-01-21 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | fight against regex succesful, fixed database request, added xmlbuilder, ↵ | Philipp Borgers | 2011-01-13 | 1 | -12/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | return xml | ||||
| * | | | | | | Merge remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-13 | 6 | -16/+837 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/nodejs/start.js | ||||
| | * | | | | | | fuck you regex... database request possible. we have to learn regex!!! | Philipp Borgers | 2011-01-13 | 1 | -7/+75 |
| | | | | | | | | |||||
| | * | | | | | | some new tries | slomo | 2011-01-12 | 6 | -43/+794 |
| |/ / / / / / | |||||
| * | | | | | | some cleanup, tests with bo | Alexander Sulfrian | 2011-01-12 | 1 | -33/+40 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:slomo/osm-spline-xapi | slomo | 2011-01-09 | 5 | -0/+416 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | first code for the db import tool | Robin Nehls | 2011-01-09 | 5 | -0/+416 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it only reads the osm header of pbf files for now, more will follow | ||||
| * | | | | | | | first node.js code | slomo | 2011-01-09 | 1 | -0/+105 |
| | | | | | | | | |||||
| * | | | | | | | first toughts | slomo | 2011-01-08 | 1 | -0/+59 |
| |/ / / / / / | |||||
| * / / / / / | initial c0mmunist | slomo | 2011-01-08 | 1 | -0/+0 |
| / / / / / | |||||
* | | | / / | forget to return client from db_connect | Mark Engel | 2011-01-21 | 1 | -19/+6 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' of github.com:slomo/osm-spline-xapi | Mark Engel | 2011-01-21 | 4 | -212/+14 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | merged | slomo | 2011-01-21 | 3 | -1/+15 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | added new config load2 | slomo | 2011-01-21 | 4 | -211/+15 |
| | | | | | |||||
* | | | | | created function db_connect which wraps connection to the database | Mark Engel | 2011-01-21 | 1 | -32/+23 |
| |/ / / |/| | | | |||||
* | | | | added host and port to config | Mark Engel | 2011-01-21 | 2 | -1/+4 |
| |_|/ |/| | | |||||
* | | | enhanced gitignore | Mark Engel | 2011-01-21 | 1 | -0/+13 |
|/ / | |||||
* | | externalized config (connectionString) | Mark Engel | 2011-01-21 | 2 | -3/+8 |
| | | |||||
* | | fixed path issus with bootstrap | slomo | 2011-01-19 | 1 | -0/+1 |
| | | |||||
* | | updated bootstrap.sh | yves | 2011-01-19 | 1 | -17/+31 |
| | | |||||
* | | fixed dependencies | steve.harrison@gmx.net | 2011-01-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:slomo/osm-spline-xapi | slomo | 2011-01-19 | 1 | -30/+67 |
|\ \ | |||||
| * | | "fixed" timestamp format; added strange flowcontrol for subqueries; ↵ | Philipp Borgers | 2011-01-16 | 1 | -30/+67 |
| | | | | | | | | | | | | introduced heavy code duplication :) => reorganize code | ||||
* | | | added npm config | slomo | 2011-01-19 | 1 | -0/+11 |
| | | | |||||
* | | | added gitignore | slomo | 2011-01-19 | 1 | -0/+1 |
| | | | |||||
* | | | added load for our package | slomo | 2011-01-19 | 1 | -0/+3 |
| | | | |||||
* | | | first version of bootstrap skript | slomo | 2011-01-19 | 1 | -0/+29 |
|/ / | |||||
* | | broken code for way requests, subquery problem... | Philipp Borgers | 2011-01-15 | 1 | -5/+42 |
| | | |||||
* | | added pg request for ways with key, value and bbox, some async improvements, ↵ | Philipp Borgers | 2011-01-14 | 1 | -57/+113 |
| | | | | | | | | write something like xml to the response, still to fix content encoding (utf8) and timestamp encoding |