Changeset [b7fcf8e19f55bf3e832dae956570601fe580723f] by Colin
Revision b7fcf8e19f55bf3e832dae956570601fe580723f,
committed by Colin
· June 16th, 2014 @ 07:28 AM
Merge branch 'master' into tabcontainer2
Conflicts:
client/apollo/js/View/Track/AnnotTrack.js
https://github.com/GMOD/jbrowse/commit/b7fcf8e19f55bf3e832dae956570...
9 changed files
-
A
server/WebApollo/src/org/bbop/apollo/web/tools/RemoveIsoforms.java -
A
server/WebApollo/tomcat/custom-valves.jar -
M
client/apollo/js/View/Track/AnnotTrack.js -
M
client/apollo/js/View/Track/DraggableAlignments.js -
M
client/apollo/js/View/Track/DraggableHTMLFeatures.js -
M
server/WebApollo/src/org/bbop/apollo/web/Login.java -
M
server/WebApollo/src/org/bbop/apollo/web/dataadapter/chado/ChadoIO.java -
M
server/WebApollo/src/org/bbop/apollo/web/user/UserManager.java -
M
server/WebApollo/src/org/bbop/apollo/web/user/localdb/LocalDbUserAuthentication.java