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

Merging Annotation header changes #240

Merged
merged 6 commits into from
Oct 16, 2018
Merged

Merging Annotation header changes #240

merged 6 commits into from
Oct 16, 2018

Commits on Oct 11, 2018

  1. Update: Annotations with header (box#233) 

    * Update: Adding headerElement to annotator options

* Update: headerElement fallback to container when using preview header

* Chore: hide the annotation button on destroy

* Chore: default to header container

* Chore: addressing comments

* Chore: Only hideButton if modeButton exists
    Conrad Chan committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    91cdce3 View commit details
    Browse the repository at this point in the history

  2. Fix: Functional tests scripts

    @pramodsum
    pramodsum committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    2dfc22e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Chore: Update preview version to 1.54.0 in functional tests (box#239)

    @pramodsum
    Conrad Chan authored and pramodsum committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    6de2cf4 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Merge branch 'master' of github.com:box/box-annotations into react

    @pramodsum
    pramodsum committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    6056334 View commit details
    Browse the repository at this point in the history

  2. Fix: Bugs

    @pramodsum
    pramodsum committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    0d11ec0 View commit details
    Browse the repository at this point in the history

  3. Fix: Tests

    @pramodsum
    pramodsum committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    8149e12 View commit details
    Browse the repository at this point in the history