Changeset [b7fcf8e19f55bf3e832dae956570601fe580723f] 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...

Committed by Colin

  • 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
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

AJAX Genome Browser