-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature blt and ostwind #22
Open
chregu
wants to merge
15
commits into
timeforcoffee:master
Choose a base branch
from
chregu:feature-blt-ostwind
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/clj/tramboard_clj/api/bvb.clj # src/clj/tramboard_clj/core/views.clj # src/cljs/tramboard_clj/script/util.cljs
and updated DB
chregu
force-pushed
the
feature-blt-ostwind
branch
from
October 21, 2015 06:26
3709b49
to
6002104
Compare
chregu
force-pushed
the
feature-blt-ostwind
branch
from
October 21, 2015 08:11
666fbf2
to
c59510a
Compare
(do-api-call request-url transform-station-response) | ||
(do-api-call2 request-url transform-station-response request-url-sbb (zvv/transform-station-response sbbid) get-hash)))) | ||
(c/do-api-call request-url transform-station-response) | ||
(c/do-api-call2 request-url transform-station-response request-url-sbb (zvv/transform-station-response sbbid) get-hash)))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shall we name that differently ? :)
looks good! just that one little comment, after that you can merge i guess, you have the rights right? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've hidden the to views in the web part for now, but it's used in the /ch/ view. Need some feedback first, how the data is. But apart from that, feel free to merge it ;)