Skip to content
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

#5680 Renamed example jar resource. #5717

Merged
merged 1 commit into from
Jul 21, 2017
Merged

#5680 Renamed example jar resource. #5717

merged 1 commit into from
Jul 21, 2017

Conversation

michalgce
Copy link
Contributor

No description provided.

@scottdraves scottdraves merged commit 999762a into master Jul 21, 2017
michalgce added a commit that referenced this pull request Jul 25, 2017
…ssage_after_succesfully_added_classpath

* origin/master: (24 commits)
  allow whitespace only cells, do not bother chelling for null code
  #5713 fix multiple clingOutputContainerLayoutManager instances (#5730)
  #5701 Optimize way of adding multiple jars to classpath. (#5729)
  #5657 plot tooltip should fade in out (#5705)
  fix #5711 by adding a readme
  further separate dev/user docs
  #5726 Separate install instructions into user and developer (#5727)
  bump version to 0.1.1
  #5715 Showing version of kernel in banner message. (#5719)
  instructions are for developers not users
  #5476 recipe in repo for conda forge (#5716)
  #5680 Renamed example jar resource. (#5717)
  #5699 pressing escape should close column search menu (#5709)
  #5698 column search should be case insensitive (#5708)
  remove the jar from our repo, add instructions to download it
  jarek/5702: remove tablesaw (#5712)
  #5703: add default imports (#5707)
  #5682 fix CyclingOutputContainerLayoutManager causes page to jump around (#5710)
  #5694 prevent user from dragging legend out of the plot (#5704)
  add tests for beakerx.widgets package (#5692)
  ...

# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
#	kernel/base/src/main/java/com/twosigma/beakerx/evaluator/Evaluator.java
#	kernel/base/src/main/java/com/twosigma/beakerx/kernel/Kernel.java
#	kernel/base/src/main/java/com/twosigma/beakerx/kernel/KernelFunctionality.java
#	kernel/base/src/main/java/com/twosigma/beakerx/kernel/commands/MagicCommand.java
#	kernel/base/src/test/java/com/twosigma/beakerx/KernelTest.java
#	kernel/base/src/test/java/com/twosigma/beakerx/jupyter/handler/ExecuteRequestHandlerMagicCommandTest.java
@scottdraves scottdraves deleted the michal/5680 branch December 18, 2017 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants