Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fix error message | Alexander Sulfrian | 2011-01-21 | 1 | -2/+2 | |
|/ | ||||||
* | Merge branch 'master' of github.com:slomo/osm-spline-xapi | Mark Engel | 2011-01-21 | 2 | -1/+4 | |
|\ | | | | | | | | | Conflicts: src/nodejs/main.js | |||||
| * | changed dict access to dot access | Alexander Sulfrian | 2011-01-21 | 1 | -2/+2 | |
| | | ||||||
| * | adding log level (cont.) | Alexander Sulfrian | 2011-01-21 | 2 | -1/+4 | |
| | | ||||||
| * | Merge remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 2 | -0/+8 | |
| |\ | ||||||
| * | | fixed error message, if no db connection is available | Alexander Sulfrian | 2011-01-21 | 1 | -2/+2 | |
| | | | ||||||
| * | | log level configuration | Alexander Sulfrian | 2011-01-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | added opts for command line parsing | Mark Engel | 2011-01-21 | 3 | -26/+29 | |
| |/ |/| | ||||||
* | | renamed main file | slomo | 2011-01-21 | 1 | -0/+0 | |
| | | ||||||
* | | new bootstrap foo | slomo | 2011-01-21 | 1 | -0/+8 | |
|/ | ||||||
* | Merge branch 'master' of github.com:slomo/osm-spline-xapi | slomo | 2011-01-21 | 1 | -88/+114 | |
|\ | ||||||
| * | removed some unused debug | Alexander Sulfrian | 2011-01-21 | 1 | -2/+0 | |
| | | ||||||
| * | fixed codelayout | Alexander Sulfrian | 2011-01-21 | 1 | -82/+82 | |
| | | ||||||
| * | Merge remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 3 | -181/+168 | |
| |\ | | | | | | | | | | | | | Conflicts: src/nodejs/no1.js | |||||
| * | | changed sql statements to prepared statements | Alexander Sulfrian | 2011-01-21 | 1 | -144/+172 | |
| | | | ||||||
| * | | Merge branch 'master', remote branch 'upstream/master' | Alexander Sulfrian | 2011-01-21 | 0 | -0/+0 | |
| | | | ||||||
* | | | added package.json | slomo | 2011-01-21 | 1 | -0/+1 | |
| |/ |/| | ||||||
* | | using indent for javascript from | Mark Engel | 2011-01-21 | 2 | -118/+117 | |
| | | | | | | | | http://www.vim.org/scripts/script.php?script_id=1491 | |||||
* | | error while merging | Mark Engel | 2011-01-21 | 1 | -10/+9 | |
| | | ||||||
* | | creation of xml data is now handled by xmlGenerator | Mark Engel | 2011-01-21 | 2 | -100/+105 | |
| | | ||||||
* | | test requests | slomo | 2011-01-21 | 1 | -0/+3 | |
| | | ||||||
* | | replaced tabs with whitespaces | slomo | 2011-01-21 | 1 | -95/+95 | |
| | | ||||||
* | | Merge branch 'master' of github.com:slomo/osm-spline-xapi | Mark Engel | 2011-01-21 | 1 | -11/+15 | |
|\ \ | | | | | | | | | | | | | Conflicts: src/nodejs/no1.js | |||||
| * | | removed remainings of old merge | slomo | 2011-01-21 | 1 | -19/+0 | |
| | | | ||||||
| * | | merged again | slomo | 2011-01-21 | 1 | -11/+6 | |
| |\ \ | ||||||
| * | | | 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 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | replaced consol logs with log4js | slomo | 2011-01-21 | 1 | -15/+15 | |
| | | | | ||||||
* | | | | refactored creation of xml way to own function | Mark Engel | 2011-01-21 | 1 | -23/+26 | |
| |_|/ |/| | | ||||||
* | | | removed old code | Mark Engel | 2011-01-21 | 1 | -29/+3 | |
| |/ |/| | ||||||
* | | typo | Mark Engel | 2011-01-21 | 1 | -4/+1 | |
|/ | ||||||
* | 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 | |
| | | | | | | |