aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
| * | | | | | | first toughtsslomo2011-01-081-0/+59
| |/ / / / / /
| * / / / / / initial c0mmunistslomo2011-01-081-0/+0
| / / / / /
* | | | / / forget to return client from db_connectMark Engel2011-01-211-19/+6
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of github.com:slomo/osm-spline-xapiMark Engel2011-01-214-212/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | mergedslomo2011-01-213-1/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | added new config load2slomo2011-01-214-211/+15
| | | | |
* | | | | created function db_connect which wraps connection to the databaseMark Engel2011-01-211-32/+23
| |/ / / |/| | |
* | | | added host and port to configMark Engel2011-01-212-1/+4
| |_|/ |/| |
* | | enhanced gitignoreMark Engel2011-01-211-0/+13
|/ /
* | externalized config (connectionString)Mark Engel2011-01-212-3/+8
| |
* | fixed path issus with bootstrapslomo2011-01-191-0/+1
| |
* | updated bootstrap.shyves2011-01-191-17/+31
| |
* | fixed dependenciessteve.harrison@gmx.net2011-01-191-1/+1
| |
* | Merge branch 'master' of github.com:slomo/osm-spline-xapislomo2011-01-191-30/+67
|\ \