aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * adding log level (cont.)Alexander Sulfrian2011-01-212-1/+4
| |
| * Merge remote branch 'upstream/master'Alexander Sulfrian2011-01-212-0/+8
| |\
| * | fixed error message, if no db connection is availableAlexander Sulfrian2011-01-211-2/+2
| | |
| * | log level configurationAlexander Sulfrian2011-01-211-1/+1
| | |
* | | added opts for command line parsingMark Engel2011-01-213-26/+29
| |/ |/|
* | renamed main fileslomo2011-01-211-0/+0
| |
* | new bootstrap fooslomo2011-01-211-0/+8
|/
* Merge branch 'master' of github.com:slomo/osm-spline-xapislomo2011-01-211-88/+114
|\
| * removed some unused debugAlexander Sulfrian2011-01-211-2/+0
| |
| * fixed codelayoutAlexander Sulfrian2011-01-211-82/+82
| |
| * Merge remote branch 'upstream/master'Alexander Sulfrian2011-01-213-181/+168
| |\ | | | | | | | | | | | | Conflicts: src/nodejs/no1.js
| * | changed sql statements to prepared statementsAlexander Sulfrian2011-01-211-144/+172
| | |
| * | Merge branch 'master', remote branch 'upstream/master'Alexander Sulfrian2011-01-210-0/+0
| | |
* | | added package.jsonslomo2011-01-211-0/+1
| |/ |/|
* | using indent for javascript fromMark Engel2011-01-212-118/+117
| | | | | | | | http://www.vim.org/scripts/script.php?script_id=1491
* | error while mergingMark Engel2011-01-211-10/+9
| |
* | creation of xml data is now handled by xmlGeneratorMark Engel2011-01-212-100/+105
| |
* | test requestsslomo2011-01-211-0/+3
| |
* | replaced tabs with whitespacesslomo2011-01-211-95/+95
| |
* | Merge branch 'master' of github.com:slomo/osm-spline-xapiMark Engel2011-01-211-11/+15
|\ \ | | | | | | | | | | | | Conflicts: src/nodejs/no1.js
| * | removed remainings of old mergeslomo2011-01-211-19/+0
| | |
| * | merged againslomo2011-01-211-11/+6
| |\ \
| * | | fixed confilictsslomo2011-01-211-1/+4
| | | |
| * | | Merge branch 'master' of github.com:slomo/osm-spline-xapislomo2011-01-211-4/+1
| |\ \ \ | | | |/ | | |/|
| * | | replaced consol logs with log4jsslomo2011-01-211-15/+15
| | | |
* | | | refactored creation of xml way to own functionMark Engel2011-01-211-23/+26
| |_|/ |/| |
* | | removed old codeMark Engel2011-01-211-29/+3
| |/ |/|
* | typoMark Engel2011-01-211-4/+1
|/
* Merge branch 'master' of github.com:slomo/osm-spline-xapiMark Engel2011-01-211-162/+170
|\ | | | | | | | | Conflicts: src/nodejs/no1.js
| * fixed codelayoutAlexander Sulfrian2011-01-211-182/+180
| |
| * Merge branch 'master', remote branch 'upstream/master'Alexander Sulfrian2011-01-210-0/+0
| |
* | refactored creation of rows to xml into own functionMark Engel2011-01-211-17/+21
|/
* Merge branch 'master' of github.com:slomo/osm-spline-xapiMark Engel2011-01-211-24/+40
|\ | | | | | | | | Conflicts: src/nodejs/no1.js
| * Merge branch 'master', remote branch 'upstream/master'Alexander Sulfrian2011-01-212-15/+24
| |\
| | * Merge branch 'master' of github.com:slomo/osm-spline-xapislomo2011-01-211-32/+23
| | |\
| | * | added log4jsslomo2011-01-212-15/+24
| | | |
| * | | removed trailing whitespacesAlexander Sulfrian2011-01-211-19/+19
| | | |
| * | | Merge branch 'master', remote branch 'upstream/master'Alexander Sulfrian2011-01-213-139/+37
| |\ \ \ | | | |/ | | |/|
| * | | removed old filesAlexander Sulfrian2011-01-211-107/+0
| | | |
| * | | Merge branch 'master' of git://github.com/slomo/osm-spline-xapiAlexander Sulfrian2011-01-212-1/+4
| |\ \ \
| * \ \ \ Merge remote branch 'upstream/master'Alexander Sulfrian2011-01-216-61/+324
| |\ \ \ \
| * \ \ \ \ Merge commit 'de2719e8d5841abce7933ea20878de79203193dd'Alexander Sulfrian2011-01-210-0/+0
| |\ \ \ \ \
| * | | | | | fight against regex succesful, fixed database request, added xmlbuilder, ↵Philipp Borgers2011-01-131-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | return xml
| * | | | | | Merge remote branch 'upstream/master'Alexander Sulfrian2011-01-136-16/+837
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/nodejs/start.js
| | * | | | | | fuck you regex... database request possible. we have to learn regex!!!Philipp Borgers2011-01-131-7/+75
| | | | | | | |
| | * | | | | | some new triesslomo2011-01-126-43/+794
| |/ / / / / /
| * | | | | | some cleanup, tests with boAlexander Sulfrian2011-01-121-33/+40
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:slomo/osm-spline-xapislomo2011-01-095-0/+416
| |\ \ \ \ \ \
| | * | | | | | first code for the db import toolRobin Nehls2011-01-095-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it only reads the osm header of pbf files for now, more will follow
| * | | | | | | first node.js codeslomo2011-01-091-0/+105
| | | | | | | |