{"shas":[["ecfaafdcf531273a2b8fb4420b51a19af4f67ae5","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (histologies/new)\nPass sample parameter (since fields moved from sample_characteristics to samples)","Sue Grimes"],["017dc320e28d93488f9d805d274563ada9fcc40b","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (histologies/new.html)\nPass sample object as parameter to _summary_info\n(due to fields moved from sample_characteristics to sample table)","Sue Grimes"],["8b1f54111e4144283aff9183b6d3c7e7e4ea2138","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","environments - updated server version","jpalm"],["167195d055d52a51f6aead61c5649db6ca864fe4","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","Merge commit '017dc320e28d93488f9d805d274563ada9fcc40b' into jen-dev-1.7_UI","jpalm"],["066c41e2c15ccda3fc82570e371a05296a169405","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","re-commented version on environments.rb","jpalm"],["97ae161d2b2783f952ae8a7f8d04a3df3455dba6","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Fix pathology comments bug (list_as_tree)","Sue Grimes"],["c40d7b3fd8e4aa9507384a30e11d6e5053a861db","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","Merge list as tree fix into jen-dev-1.7_UI","jpalm"],["057a8bfea6d722077f4c6f3e1649df6502d04376","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","application.html - adjusted top nav margin bottom","jpalm"],["a221ab59aa3f0f54cab871b412ab6ddb52e9620b","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","list_as_tree - removed s from characteristics on comment condition","jpalm"],["e718227a260096b6d667884ab7dbdcafa70cd2c1","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (sample_queries/list_as_tree)","Sue Grimes"],["97aac3767441207eee7f9a57b65f8c245bd36897","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Merge branch 'jen-dev-1.7_UI' of git@github.com:suegrimes/seqLIMS.git into sue-dev-1.7_UI\n\nConflicts:\n\tapp/views/sample_queries/list_as_tree.html.erb","Sue Grimes"],["acb3ae09d16891028a2128c7ba7a8e02d0621411","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (sample.rb)\nsample_amt error for certain units of measure.","Sue Grimes"],["2bc59ea07a585cdaa14c89b72be6aeeafcbba59c","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Merge branch 'master' into sue-dev-1.7_UI\n\nConflicts:\n\tapp/views/histologies/new.html.erb","Sue Grimes"],["b1943a3df45c846627c75b433fbed5c70ccee22b","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Revise processed_samples/new form (bug), and show form (add H&E)","Sue Grimes"],["b79ab8529f56502e80e77520a449358ec8d3efba","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Merge branch 'master' of git@github.com:suegrimes/seqLIMS.git into sue-dev-1.7_UI\n\nConflicts:\n\tapp/controllers/processed_samples_controller.rb","Sue Grimes"],["ee13dec4c79fcb5188e492c139c16dc134fcbd46","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Merge branch 'jen-dev-seqLIMS' of git@github.com:suegrimes/seqLIMS.git into sue-dev-1.7_UI\n\nConflicts:\n\t.gitignore\n\tapp/views/layouts/application.rhtml\n\tapp/views/sample_queries/list_as_tree.html.erb\n\tapp/views/welcome/login.rhtml\n\tpublic/stylesheets/lims_std.css","Sue Grimes"],["429e57d240b35667f87920a527d2dacc2a6db26c","7a9fce1b397f1911c8e36cb402ed61e5ecda2a30@gmail.com","application.html - run dirs","jpalm"],["0337d139109f0d040605d2f1b4d3fc27b43a13f8","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Merge branch 'jen-dev-1.7_UI' of git@github.com:suegrimes/seqLIMS.git into sue-dev-1.7_UI\n\nConflicts:\n\tapp/views/layouts/application.rhtml","Sue Grimes"],["5cfda3d74bbbdd9bd221966db5462d67c82a1f05","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (date conditions in query)\nRemove obsolete copies of application.rhtml","Sue Grimes"],["11dcb5f382217ff2373751ebc8f7265234abc877","e0f94040b735d756ca61a92b76aa1f7cbb3a8de0@stanford.edu","Bug fix (date range in query)","Sue Grimes"]],"repo":"suegrimes/seqLIMS","actor":"jpalm","ref":"refs/heads/jen-proto-1.7_UI","size":23,"head":"6597fc9659fcea3f8b62eaafded3529de6d9c85c","actor_gravatar":"95ff55485d51ce1bc75c6f9c75c9d06c","push_id":26528999}