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

Conversation

aashish24
Copy link
Contributor

No description provided.

Sam Fries and others added 30 commits April 29, 2015 11:20
Fixed resizing issue and added two tests to cover it
5901761
@doutriaux1
grid var name hadn't been renamed everywhere...
d82a6e1 
fix #1245
@doutriaux1
added test
aaa238d
Rewrote test I accidentally deleted
180c61b
Fix issue where colorpicker couldn't pick colors
024a6da
Colorpicker selection fixed, test added
7ae5bf7
@aashish24
Added new script to run tests
f9a7c09
@aashish24
Using cdat macro for testing
a8213ca
@aashish24
Converted last of tests to use cdat test macro
68652da
@aashish24
Removed osx as its failing on travis
3aaa5da
@aashish24
Merge pull request #1247 from UV-CDAT/issue_1245_meshfill_grid_error
c4c39c0 
grid var name hadn't been renamed everywhere...
Merge pull request #1258 from chaosphere2112/colorpicker_renderer_sel…
32f3893 
…ection

Colorpicker renderer selection
@doutriaux1
added option to turn paraview build on/off
a446afb
@doutriaux1
cdat paraview deps flag correct now
1c6cae7
@ThomasMaxwell
Remove references to Variable.name
f63908b
@ThomasMaxwell
Fix missing time axis
3c0155b
@remram44
Fixes more typos in raise statements
c32b6fe
@doutriaux1
Merge pull request #1269 from UV-CDAT/vcs3D-fix_release_issues
77bcd01 
Vcs3 d fix release issues
@doutriaux1
Merge pull request #1270 from UV-CDAT/fix-cdms-exceptions
6ea8a64 
Fixes more typos in raise statements
@jbeezley
Fix textbox_blank_text test
1d4a7ef
@aashish24
Merge pull request #1261 from UV-CDAT/fix_run_tests_buildbot
821011d 
Fix run tests buildbot
@doutriaux1
Merge branch 'release' into issue_903_turn_off_paraview
5c2baa4
Merged master
3650d29
@chaosphere2112
Added toolbar display, open, and close tests
c185855
@chaosphere2112
Added a sprinkling of assertions
908c869
@chaosphere2112
Fixed an issue where togglebuttons were doing waaay too much work
98464ec
@chaosphere2112
Added test for get_text on toggle buttons
7f68b7a
@chaosphere2112
Updated toolbar open/close to go through more of open/close process
e33e312
@chaosphere2112
Added toolbar_in_toolbar tests
03fd1af
@chaosphere2112
Fixed some layout bugs with toolbars
01621d9
@aashish24
Copy link
Contributor Author

@dlonie @chaosphere2112 @doutriaux1 please review.

@aashish24
Copy link
Contributor Author

@chaosphere2112 is there anything we have to pick up from master into release (so the other way round).

@chaosphere2112
Copy link
Contributor

@aashish24 Nope, I don't think so. Here are the commits in Master that aren't in release currently:

Developer Commit Message SHA
aashish24 Merge remote-tracking branch 'origin/release' cdf05a4
aashish24 Merge pull request #1262 from UV-CDAT/update_master … df355f9
dlonie Add checkFuzzyBoolean representation. … 63f64f1
dlonie Add vcsvtk.Pipeline interface, ported VTKPlots.plot2D to use it. … 7416eab
dlonie Add vectorpipeline plots to vcsvtk submodule. 8090db5
dlonie Add Pipeline1D. 5798113
doutriaux1 Merge pull request #1229 from dlonie/vtk-refactor … 538cf4b

@dlonie's should all be the VTK refactor (along with @doutriaux1's), and it looks like yours are a merge to master from release previously.

@doutriaux1
Copy link
Contributor

@aashish24 I think we're good.

@alliepiper
Copy link
Contributor

LGTM, tests pass.

+1

@aashish24
Copy link
Contributor Author

Thanks guys 😊

@doutriaux1
Copy link
Contributor

@aashish24 just approved a branch from @jbeezley care to add it?

@huiwanpnnl
Copy link

I can do it afterwards.. no worries...this is @aashish24

aashish24 added a commit that referenced this pull request May 8, 2015
@aashish24
Merge pull request #1296 from UV-CDAT/sync_master
b14e373 
Sync master
@aashish24 aashish24 merged commit b14e373 into master May 8, 2015
@aashish24 aashish24 deleted the sync_master branch May 8, 2015 13:30
@jbeezley jbeezley mentioned this pull request May 8, 2015
Closed
@aashish24 aashish24 mentioned this pull request May 22, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@aashish24 @chaosphere2112 @doutriaux1 @alliepiper @huiwanpnnl @ThomasMaxwell @remram44 @jbeezley