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

Media Previewer #767

Merged
merged 51 commits into from
Sep 30, 2015
Merged

Media Previewer #767

merged 51 commits into from
Sep 30, 2015

Commits on Sep 1, 2015

  1. initial stab at preview feature

    @pandafulmanda
    pandafulmanda committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    e95133b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. stashing changes for now

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    da2418b View commit details
    Browse the repository at this point in the history

  2. basic functionality of link preview in place

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    dddb292 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/link-preview

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    978c1f3 View commit details
    Browse the repository at this point in the history

  4. media previewer shows on hover

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    5083319 View commit details
    Browse the repository at this point in the history

  5. some media previewer clean up

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    1587ce5 View commit details
    Browse the repository at this point in the history

  6. merging in tutor-table mixin yay

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    e87f82f View commit details
    Browse the repository at this point in the history

  7. add table styles to media previewer

    @pandafulmanda
    pandafulmanda committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    42a42cd View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. refinement around when to show popover/only show popover when media i… 

    …sn't showing
    @pandafulmanda
    pandafulmanda committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    00d6166 View commit details
    Browse the repository at this point in the history

  2. make sure popover positions when image content loads, fix table highl… 

    …ight
    @pandafulmanda
    pandafulmanda committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    702d49d View commit details
    Browse the repository at this point in the history

  3. cleaning up old method

    @pandafulmanda
    pandafulmanda committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    c29963e View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. make big tables scrollable in preview

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    b7cf2e8 View commit details
    Browse the repository at this point in the history

  2. popover figures out an optimal placement, left or right based on content

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    08c2bdd View commit details
    Browse the repository at this point in the history

  3. separate popover positioning logic from media previewer specific stuffs

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    5cd9e32 View commit details
    Browse the repository at this point in the history

  4. merge and resolve print safe

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    7208bfe View commit details
    Browse the repository at this point in the history

  5. task can parse exercise html as well, test media flux

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    279bc72 View commit details
    Browse the repository at this point in the history

  6. test interactions of media previewer

    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    2dd5adf View commit details
    Browse the repository at this point in the history

  7. clean up tests a bit, add tests for tutor popover component, checking… 

    … self positioning, image re-positioning, and scrollable height setting
    @pandafulmanda
    pandafulmanda committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    3e01316 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2015

  1. Merge branch 'master' into feature/link-preview

    @pandafulmanda
    pandafulmanda committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    e5e00e9 View commit details
    Browse the repository at this point in the history

  2. merging in master updates to external linking styling and resolving

    @pandafulmanda
    pandafulmanda committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    26d04c8 View commit details
    Browse the repository at this point in the history

  3. link to media in refernce book if media not on page

    @pandafulmanda
    pandafulmanda committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    3241ef2 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2015

  1. tutor popover auto scrollable when content is too tall for window

    @pandafulmanda
    pandafulmanda committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    dbc6778 View commit details
    Browse the repository at this point in the history

  2. make link previewer a loadable

    @pandafulmanda
    pandafulmanda committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    5f1e4d2 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. resolve conflicts from styles update

    @pandafulmanda
    pandafulmanda committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    d8c9f70 View commit details
    Browse the repository at this point in the history

  2. adjust scrollable popover test to fake scrollable sooner

    @pandafulmanda
    pandafulmanda committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    07cd1bf View commit details
    Browse the repository at this point in the history

  3. i would like this test to pass on travis

    @pandafulmanda
    pandafulmanda committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    fa413cf View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2015

  1. handle links to figures on a different page as well

    @pandafulmanda
    pandafulmanda committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    14312e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/link-preview' into feature/link-preview-async

    @pandafulmanda
    pandafulmanda committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    3d910bb View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. pull out step reading content to it's own more specifc content so tha… 

    …t only content links get processed, as opposed to footer links as well, clean up prop names
    @pandafulmanda
    pandafulmanda committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    a0265d6 View commit details
    Browse the repository at this point in the history

  2. link out prop for media previewer

    @pandafulmanda
    pandafulmanda committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    00131f4 View commit details
    Browse the repository at this point in the history

  3. try to help with the finicky-ness of the tests that fake window sizes

    @pandafulmanda
    pandafulmanda committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    4a4be3a View commit details
    Browse the repository at this point in the history

  4. tests for async media loading into link previewer

    @pandafulmanda
    pandafulmanda committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    f10f0a1 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. add image loading indication

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    805a093 View commit details
    Browse the repository at this point in the history

  2. relax image on load testing

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    35b0690 View commit details
    Browse the repository at this point in the history

  3. Travis, let my tests go.

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    eb2c2f8 View commit details
    Browse the repository at this point in the history

  4. add space to show loading label

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    ba26df8 View commit details
    Browse the repository at this point in the history

  5. resolve conflicts from scrolling pr

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    6fefd7a View commit details
    Browse the repository at this point in the history

  6. clean up scroll to mixin function names, clean up target styling

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    e53a7e5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/link-preview' into feature/link-preview-async

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    74e96ea View commit details
    Browse the repository at this point in the history

  8. help travis with tests hopefully

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    50183b3 View commit details
    Browse the repository at this point in the history

  9. resolve conflicts from parent test updates, clean up faking popover code

    @pandafulmanda
    pandafulmanda committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    da0b946 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2015

  1. update target to link-target, make tutor-popover more flexible about … 

    …it's linker, handle multiple images in tutor-popover, minor clean up
    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    a667af2 View commit details
    Browse the repository at this point in the history

  2. update specs for media preview to use link-target, check for width ov… 

    …erflow as well for tutor-popover
    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    d74ae0f View commit details
    Browse the repository at this point in the history

  3. allow other content in tutor-popover other than just html string

    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    9ee45a6 View commit details
    Browse the repository at this point in the history

  4. there was some weird thing where isMounted as return false during the… 

    … tests so then i did that wierd function = null thing on componentWillUnmount, but that doesn't seem necessary anymore, so yay!
    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    2c7905c View commit details
    Browse the repository at this point in the history

  5. fix clone with props warning for media popover

    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    24afed4 View commit details
    Browse the repository at this point in the history

  6. split up image loading tests for popover to make the tests less senst… 

    …ive for travis push
    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    5aedd9b View commit details
    Browse the repository at this point in the history

  7. adjustments to figure out travis

    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    6e073fd View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into feature/link-preview-async

    @pandafulmanda
    pandafulmanda committed Sep 28, 2015
    Configuration menu
    Copy the full SHA
    c64dfdf View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. force images to not be loaded initially in tests

    @pandafulmanda
    pandafulmanda committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    2af2c83 View commit details
    Browse the repository at this point in the history

  2. loosen test for travis

    @pandafulmanda
    pandafulmanda committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    ad355da View commit details
    Browse the repository at this point in the history