search

480Oswego2013 / CSC-HCI-480-2013-repo

8 stars 8 forks source link

Merge prep - Review Request #13

Closed kevinwinahradsky closed 11 years ago

kevinwinahradsky commented 11 years ago

Working on merging our 3 active branches into one so we easily merge back into the master. uibinder h2oapi build

kevinwinahradsky commented 11 years ago

This is ready and should be a clean merge to master.

Looking for a couple others to verify this.

kevinwinahradsky commented 11 years ago

This would be the devmerge branch https://github.com/480Oswego2013/CSC-HCI-480-2013-repo/tree/devmerge

patricktoohey commented 11 years ago

Confirmed

  1. Parsed Data Sets
  2. Pop-outs
  3. Generate Forest
  4. Generate Secondary Forest

Issue

  1. After generate forest, "Trees" button is non-functional
  2. After generate second forest, "Trees" button is functional
patricktoohey commented 11 years ago

should assign this to Ben next?

patricktoohey commented 11 years ago

On a second pass...

  1. After generate forest, "Trees" button is functional.
  2. After display tree, "Generate Forest" button is non-functional???
kevinwinahradsky commented 11 years ago

Yeah at this point the generate forest button only works once. This is intentional and has been that way for a while. Though if it makes no sense for it to work that way it can easily be changed.

kevinwinahradsky commented 11 years ago

Is ben a contributor? I'm not sure which username is his if he is.

mkhayes commented 11 years ago

I have tested this branch out and it seems to work quite nicely. I say we merge this guy to main so we can finally move on...

patricktoohey commented 11 years ago

Closed. Merge to master complete.