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.

Sign up for GitHub

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

Jump to bottom

Add LegendItem #5229

Merged
merged 38 commits into from Oct 3, 2016
Merged

Add LegendItem #5229

merged 38 commits into from Oct 3, 2016

Commits on Sep 23, 2016

  1. Add first helper test for _process_legend_kwargs

    Sarah Bird committed Sep 23, 2016
    Copy the full SHA
    fe2a1c8 View commit details
    Browse the repository at this point in the history

  2. Add tests for _process_legend_kwargs

    Sarah Bird committed Sep 23, 2016
    Copy the full SHA
    eb22687 View commit details
    Browse the repository at this point in the history

  3. Add failing test for compound legends

    Sarah Bird committed Sep 23, 2016
    Copy the full SHA
    66bdb68 View commit details
    Browse the repository at this point in the history

  4. Fix compound legends

    Sarah Bird committed Sep 23, 2016
    Copy the full SHA
    4c01a98 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2016

  1. Remove legends from Legend, add LegendItem, remove label from Glyph

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    58f039a View commit details
    Browse the repository at this point in the history

  2. Fix-up label/legend handling on plotting

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    96340d4 View commit details
    Browse the repository at this point in the history

  3. Add LegendItem to CoffeeScript side

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    4549f19 View commit details
    Browse the repository at this point in the history

  4. Start fixing up JS tests

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    ad9d797 View commit details
    Browse the repository at this point in the history

  5. Make progress on LegendItem

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    b2f2407 View commit details
    Browse the repository at this point in the history

  6. Finish fixing up legend items

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    777714f View commit details
    Browse the repository at this point in the history

  7. Start working on TypeScript API

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    f7b8135 View commit details
    Browse the repository at this point in the history

  8. Fix bug in update_legend

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    b30fcc6 View commit details
    Browse the repository at this point in the history

  9. Update legend handling on js plotting api

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    609642f View commit details
    Browse the repository at this point in the history

  10. Fix-up plotting legends

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    595df30 View commit details
    Browse the repository at this point in the history

  11. Add validation error for non matching datasources python side

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    95ec27b View commit details
    Browse the repository at this point in the history

  12. Add column name validation to python

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    0927fea View commit details
    Browse the repository at this point in the history

  13. Add LegendItem validation on BokehJS

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    0b83f64 View commit details
    Browse the repository at this point in the history

  14. Rename legend_margin, legend_padding, legend_spacing 

    Remove legend_ prefix
    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    96f99ab View commit details
    Browse the repository at this point in the history

  15. remove console.log statement

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    e8e5b11 View commit details
    Browse the repository at this point in the history

  16. Deprecate legend_margin, legend_spacing, legend_padding

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    8280973 View commit details
    Browse the repository at this point in the history

  17. Fix-up compat code

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    2770ee3 View commit details
    Browse the repository at this point in the history

  18. Use LegendItem in charts

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    acba186 View commit details
    Browse the repository at this point in the history

  19. Fix-up daylight example

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    34f5142 View commit details
    Browse the repository at this point in the history

  20. Fix up examples

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    7bda9ea View commit details
    Browse the repository at this point in the history

  21. Fix up docs

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    521c211 View commit details
    Browse the repository at this point in the history

  22. Code quality 

    And small PEP8 cleanup
    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    c217ad7 View commit details
    Browse the repository at this point in the history

  23. Fix-up examples further

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    a2faf44 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into birdsarah/5202_4526_use_legend_items_fix_m… 

    …erging_fix_up_api
    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    e373e1d View commit details
    Browse the repository at this point in the history

  25. Fix-up selenium test

    Sarah Bird committed Sep 25, 2016
    Copy the full SHA
    05fdea1 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2016

  1. Clean-up

    Sarah Bird committed Sep 26, 2016
    Copy the full SHA
    33ab7f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2016

  1. Merge branch 'master' into birdsarah/5202_4526_use_legend_items_fix_m… 

    …erging_fix_up_api

Conflicts:
	bokeh/plotting/helpers.py
	bokehjs/src/coffee/models/glyphs/glyph.coffee
    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    5f62530 View commit details
    Browse the repository at this point in the history

  2. small JS cleanups

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    98be40d View commit details
    Browse the repository at this point in the history

  3. add .accepts to accept list of tuples

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    8841ee6 View commit details
    Browse the repository at this point in the history

  4. used name literals in tests

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    e2acf2e View commit details
    Browse the repository at this point in the history

  5. update to new deprecation style

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    2da4a65 View commit details
    Browse the repository at this point in the history

  6. try explicit (different) port

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    e4ebc37 View commit details
    Browse the repository at this point in the history

  7. revert last unhelpful commit

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    563f7e4 View commit details
    Browse the repository at this point in the history

  8. try using --rerun

    @bryevdv
    bryevdv committed Oct 3, 2016
    Copy the full SHA
    7c5c4b3 View commit details
    Browse the repository at this point in the history