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

Sync master #1296

Merged
merged 38 commits into from
May 8, 2015
Merged

Sync master #1296

merged 38 commits into from
May 8, 2015

Commits on Apr 29, 2015

  1. Fixed resizing issue and added two tests to cover it

    Sam Fries committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    5901761 View commit details
    Browse the repository at this point in the history

  2. grid var name hadn't been renamed everywhere... 

    fix #1245
    @doutriaux1
    doutriaux1 committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    d82a6e1 View commit details
    Browse the repository at this point in the history

  3. added test

    @doutriaux1
    doutriaux1 committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    aaa238d View commit details
    Browse the repository at this point in the history

Commits on May 1, 2015

  1. Rewrote test I accidentally deleted

    Sam Fries committed May 1, 2015
    Configuration menu
    Copy the full SHA
    180c61b View commit details
    Browse the repository at this point in the history

  2. Fix issue where colorpicker couldn't pick colors

    Sam Fries committed May 1, 2015
    Configuration menu
    Copy the full SHA
    024a6da View commit details
    Browse the repository at this point in the history

  3. Colorpicker selection fixed, test added

    Sam Fries committed May 1, 2015
    Configuration menu
    Copy the full SHA
    7ae5bf7 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2015

  1. Added new script to run tests

    @aashish24
    aashish24 committed May 2, 2015
    Configuration menu
    Copy the full SHA
    f9a7c09 View commit details
    Browse the repository at this point in the history

  2. Using cdat macro for testing

    @aashish24
    aashish24 committed May 2, 2015
    Configuration menu
    Copy the full SHA
    a8213ca View commit details
    Browse the repository at this point in the history

  3. Converted last of tests to use cdat test macro

    @aashish24
    aashish24 committed May 2, 2015
    Configuration menu
    Copy the full SHA
    68652da View commit details
    Browse the repository at this point in the history

  4. Removed osx as its failing on travis

    @aashish24
    aashish24 committed May 2, 2015
    Configuration menu
    Copy the full SHA
    3aaa5da View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1247 from UV-CDAT/issue_1245_meshfill_grid_error 

    grid var name hadn't been renamed everywhere...
    @aashish24
    aashish24 committed May 2, 2015
    Configuration menu
    Copy the full SHA
    c4c39c0 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2015

  1. Merge pull request #1258 from chaosphere2112/colorpicker_renderer_sel… 

    …ection

Colorpicker renderer selection
    David Lonie committed May 4, 2015
    Configuration menu
    Copy the full SHA
    32f3893 View commit details
    Browse the repository at this point in the history

  2. added option to turn paraview build on/off

    @doutriaux1
    doutriaux1 committed May 4, 2015
    Configuration menu
    Copy the full SHA
    a446afb View commit details
    Browse the repository at this point in the history

  3. cdat paraview deps flag correct now

    @doutriaux1
    doutriaux1 committed May 4, 2015
    Configuration menu
    Copy the full SHA
    1c6cae7 View commit details
    Browse the repository at this point in the history

  4. Remove references to Variable.name

    @ThomasMaxwell
    ThomasMaxwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    f63908b View commit details
    Browse the repository at this point in the history

  5. Fix missing time axis

    @ThomasMaxwell
    ThomasMaxwell committed May 4, 2015
    Configuration menu
    Copy the full SHA
    3c0155b View commit details
    Browse the repository at this point in the history

  6. Fixes more typos in raise statements

    @remram44
    remram44 committed May 4, 2015
    Configuration menu
    Copy the full SHA
    c32b6fe View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1269 from UV-CDAT/vcs3D-fix_release_issues 

    Vcs3 d fix release issues
    @doutriaux1
    doutriaux1 committed May 4, 2015
    Configuration menu
    Copy the full SHA
    77bcd01 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. Merge pull request #1270 from UV-CDAT/fix-cdms-exceptions 

    Fixes more typos in raise statements
    @doutriaux1
    doutriaux1 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    6ea8a64 View commit details
    Browse the repository at this point in the history

  2. Fix textbox_blank_text test

    @jbeezley
    jbeezley committed May 5, 2015
    Configuration menu
    Copy the full SHA
    1d4a7ef View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1261 from UV-CDAT/fix_run_tests_buildbot 

    Fix run tests buildbot
    @aashish24
    aashish24 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    821011d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release' into issue_903_turn_off_paraview

    @doutriaux1
    doutriaux1 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    5c2baa4 View commit details
    Browse the repository at this point in the history

  5. Merged master

    Sam Fries committed May 5, 2015
    Configuration menu
    Copy the full SHA
    3650d29 View commit details
    Browse the repository at this point in the history

  6. Added toolbar display, open, and close tests

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    c185855 View commit details
    Browse the repository at this point in the history

  7. Added a sprinkling of assertions

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    908c869 View commit details
    Browse the repository at this point in the history

  8. Fixed an issue where togglebuttons were doing waaay too much work

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    98464ec View commit details
    Browse the repository at this point in the history

  9. Added test for get_text on toggle buttons

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    7f68b7a View commit details
    Browse the repository at this point in the history

  10. Updated toolbar open/close to go through more of open/close process

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    e33e312 View commit details
    Browse the repository at this point in the history

  11. Added toolbar_in_toolbar tests

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    03fd1af View commit details
    Browse the repository at this point in the history

  12. Fixed some layout bugs with toolbars

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    01621d9 View commit details
    Browse the repository at this point in the history

  13. Added tests to CMakeLists

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    c979e41 View commit details
    Browse the repository at this point in the history

  14. Added state_advance test for buttons

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    2076acf View commit details
    Browse the repository at this point in the history

  15. Tabs -> spaces

    @chaosphere2112
    chaosphere2112 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    2c51812 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #1242 from chaosphere2112/text_resizing_window_place 

    Fixed resizing issue and added two tests to cover it
    @doutriaux1
    doutriaux1 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    3850d33 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2015

  1. Merge pull request #1273 from chaosphere2112/toolbar_layout_fixes 

    Toolbar layout fixes
    David Lonie committed May 6, 2015
    Configuration menu
    Copy the full SHA
    5d7882e View commit details
    Browse the repository at this point in the history

  2. Fix list method

    @ThomasMaxwell
    ThomasMaxwell committed May 6, 2015
    Configuration menu
    Copy the full SHA
    66ff3ff View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1287 from UV-CDAT/vcs3D_fix_dv3d_list 

    Fix list method
    @doutriaux1
    doutriaux1 committed May 6, 2015
    Configuration menu
    Copy the full SHA
    94f63d6 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2015

  1. Merge pull request #1267 from UV-CDAT/issue_903_turn_off_paraview 

    Issue 903 turn off paraview
    @aashish24
    aashish24 committed May 7, 2015
    Configuration menu
    Copy the full SHA
    8a9b545 View commit details
    Browse the repository at this point in the history