Permalink
Switch branches/tags
wtsi_portal-staging-2011-05-17.2 wtsi_portal-staging-2011-05-17.1 wtsi_portal-staging-2011-05-04.2 wtsi_portal-staging-2011-05-04.1 wtsi_portal-staging-2011-04-20.1 wtsi_portal-staging-2011-04-19.1 wtsi_portal-staging-2011-04-14.1 wtsi_portal-staging-2011-04-13.2 wtsi_portal-staging-2011-04-13.1 wtsi_portal-staging-2011-02-18.2 wtsi_portal-staging-2011-02-18.1 wtsi_portal-staging-2011-02-10.1 wtsi_portal-production-2011-05-04.2 wtsi_portal-production-2011-05-04.1 wtsi_portal-production-2011-04-20.1 wtsi_portal-production-2011-04-19.1 ikmc_portal-staging-2011-06-10.1 ikmc_portal-staging-2011-05-06.1 ikmc_portal-staging-2011-05-03.1 ikmc_portal-staging-2011-04-28.2 ikmc_portal-staging-2011-04-28.1 ikmc_portal-staging-2011-04-20.1 ikmc_portal-staging-2011-04-18.1 ikmc_portal-staging-2011-04-15.1 ikmc_portal-staging-2011-04-14.1 ikmc_portal-staging-2011-04-01.1 ikmc_portal-staging-2011-03-31.1 ikmc_portal-staging-2011-02-22.1 ikmc_portal-staging-2011-02-21.1 ikmc_portal-staging-2011-02-14.3 ikmc_portal-staging-2011-02-14.2 ikmc_portal-staging-2011-02-14.1 ikmc_portal-staging-2011-02-10.1 ikmc_portal-staging-2011-01-26.1 ikmc_portal-staging-2011-01-25.4 ikmc_portal-staging-2011-01-25.3 ikmc_portal-staging-2011-01-25.2 ikmc_portal-staging-2011-01-25.1 ikmc_portal-staging-2011-01-21.1 ikmc_portal-staging-2011-01-20.1 ikmc_portal-staging-2011-01-18.1 ikmc_portal-staging-2011-01-06.2 ikmc_portal-staging-2011-01-06.1 ikmc_portal-staging-2011-01-05.1 ikmc_portal-production-2011-05-06.1 ikmc_portal-production-2011-05-03.1 ikmc_portal-production-2011-04-20.1 ikmc_portal-production-2011-04-18.1 ikmc_portal-production-2011-04-15.1 ikmc_portal-production-2011-04-14.1 ikmc_portal-production-2011-04-01.1 ikmc_portal-production-2011-03-31.1 ikmc_portal-production-2011-02-22.1 ikmc_portal-production-2011-02-21.1 ikmc_portal-production-2011-02-14.3 ikmc_portal-production-2011-02-14.2 ikmc_portal-production-2011-02-10.1 ikmc_portal-production-2011-01-26.1 ikmc_portal-production-2011-01-25.4 ikmc_portal-production-2011-01-06.2 ikmc_portal-production-2011-01-06.1
Nothing to show
Commits on Apr 15, 2011
  1. Switched the template the downtime warning is in so that it appears o…

    …n all pages.
    Daz Oakley committed Apr 15, 2011
Commits on Apr 14, 2011
  1. Added in a warning about downtime. refs #4664

    Daz Oakley committed Apr 14, 2011
  2. Merge branch 'master' into ikmc_portal

    * master:
      Group the published graphs by the test_description as the test name is not guarenteed to be unique in MGP land. refs #4661
      Update jQuery TableSorter to 2.0.5b - seems to resolve the errors that we were seeing when compressed with closure compiler.
      typo correction: mamalian -> mammalian
      Set the content type of static files using Rack::Mime.
      switch the deployment to use http instead of git.
      Fix for the 'index_concatenated_ontology_terms' method - it was not taking into account the times when the term description follows the id etc...
      Bugfix - I had too many 'use_to_map' directives
      Start to index the MP terms from the MGP Paramater Level Heatmap. refs #4661
      Add some error catching into the 'wtsi_phenotyping_progress_counts' method.
      Method rename: complete_mgp_genes_count -> complete_mgp_alleles_count it's more correct.
      Clean up the wtsi_phenotyping_counts function - now looks like we're getting the right counts! :) closes #4136
      Sinatra will now handle serving up the MGP heatmap (setting the correct cache headers etc).
      - Remove the heatmap tooltip template (no longer used) - Put a few 'Still under development' markers where things aren't finished - rename 'skin_screen' templates to 'tail_epidermis_wholemount'
      Put in a temporary test-based heatmap (almost identical to MGP) so that we can try and get something out the door before concentrating on the MP heatmap.
      Updated Gemfile.lock
    
    Conflicts:
    	config/deploy.rb
    	config/index_builder/index_builder.json
    Daz Oakley committed Apr 14, 2011
  3. Group the published graphs by the test_description as the test name i…

    …s not guarenteed to be unique in MGP land. refs #4661
    Daz Oakley committed Apr 14, 2011
  4. Update jQuery TableSorter to 2.0.5b - seems to resolve the errors tha…

    …t we were seeing when compressed with closure compiler.
    Daz Oakley committed Apr 14, 2011
  5. typo correction: mamalian -> mammalian

    Daz Oakley committed Apr 14, 2011
  6. Set the content type of static files using Rack::Mime.

    Daz Oakley committed Apr 14, 2011
Commits on Apr 13, 2011
  1. switch the deployment to use http instead of git.

    Daz Oakley committed Apr 13, 2011
  2. Fix for the 'index_concatenated_ontology_terms' method - it was not t…

    …aking into account the times when the term description follows the id etc...
    Daz Oakley committed Apr 13, 2011
  3. Bugfix - I had too many 'use_to_map' directives

    Daz Oakley committed Apr 13, 2011
  4. Start to index the MP terms from the MGP Paramater Level Heatmap. ref…

    …s #4661
    Daz Oakley committed Apr 13, 2011
  5. Add some error catching into the 'wtsi_phenotyping_progress_counts' m…

    …ethod.
    Daz Oakley committed Apr 13, 2011
  6. Method rename: complete_mgp_genes_count -> complete_mgp_alleles_count…

    … it's more correct.
    Daz Oakley committed Apr 13, 2011
  7. Clean up the wtsi_phenotyping_counts function - now looks like we're …

    …getting the right counts! :) closes #4136
    Daz Oakley committed Apr 13, 2011
  8. Sinatra will now handle serving up the MGP heatmap (setting the corre…

    …ct cache headers etc).
    Daz Oakley committed Apr 13, 2011
  9. - Remove the heatmap tooltip template (no longer used)

    - Put a few 'Still under development' markers where things aren't finished
    - rename 'skin_screen' templates to 'tail_epidermis_wholemount'
    Daz Oakley committed Apr 13, 2011
  10. Put in a temporary test-based heatmap (almost identical to MGP) so th…

    …at we can try and get something out the door before concentrating on the MP heatmap.
    Daz Oakley committed Apr 13, 2011
  11. Updated Gemfile.lock

    Daz Oakley committed Apr 13, 2011
Commits on Apr 5, 2011
  1. Merge branch 'master' into ikmc_portal

    * master:
      Make the es_cell qc display use the full-width of the screen.
    Daz Oakley committed Apr 5, 2011
  2. Merge branch 'master' into ikmc_portal

    * master:
      Bugfix to stop the project page blowing up when we have problems retrieving data from the search index. (see http://htgt.internal.sanger.ac.uk:4007/apps/ikmc-mouse-portal/errs/4d9a0f5d26c72546ae000002)
    Daz Oakley committed Apr 5, 2011
Commits on Apr 1, 2011
  1. Merge branch 'master' into ikmc_portal

    * master:
      Bugfix - we now display the correct order button for non-ikmc mouse lines from EMMA. closes #4627
    Daz Oakley committed Apr 1, 2011
  2. Bugfix - we now display the correct order button for non-ikmc mouse l…

    …ines from EMMA. closes #4627
    Daz Oakley committed Apr 1, 2011
Commits on Mar 31, 2011
  1. Bugfix for the cache:prime task - it was still referenecing the old w…

    …ay of preparing the browse controls.
    Daz Oakley committed Mar 31, 2011
  2. Merge branch 'master' into ikmc_portal

    * master:
      Some more finessing of the 'no-data' styling.
      I ran 'bundle update'...
    Daz Oakley committed Mar 31, 2011
  3. Merge branch 'gem_update'

    * gem_update:
      I ran 'bundle update'...
    Daz Oakley committed Mar 31, 2011
  4. Some more finessing of the 'no-data' styling.

    Daz Oakley committed Mar 31, 2011
  5. I ran 'bundle update'...

    Daz Oakley committed Mar 31, 2011
  6. Merge branch 'master' into ikmc_portal

    * master:
      Remove the link to the old HTGT project pages
    Daz Oakley committed Mar 31, 2011
  7. Remove the link to the old HTGT project pages

    Daz Oakley committed Mar 31, 2011
  8. Merge branch 'master' into ikmc_portal

    * master: (21 commits)
      When we have no data to display (for a dataview etc) instead of hiding the bubbles entirely, display a generic greyed out one. closes #4407
      Update the WTSI MGP front-page counts with new logic from Jaqui. refs #4136
      Re-suppress the 'mice in progress' on the project page.
      Start showing mirKO images!
      Updated the project page to be able to link to UCSC human.
      Updated the code for the UCSC genome browser links to be a bit more generic. refs #4583
      Update the project page 'Mice' so that we now show MI's in progress with the same level of detail as the genotype confirmed ones.  Also updated the order button logic to give 'express interest' links for these MI's that are in progress. closes #4470
      Updated the main search idcc_targ_rep grab to get the cassette type out of the targ_rep biomart rather than try to work it out.
      Added the cassette_type to the project report page.
      Fixed the ordering of the downloadable heatmap legend.
      Updated Sinatra to the latest release.
      Transpose the ES Cell Summary table.
      In Mice - override the allele_name if we have a corrected one stored in Kermits.
      Test suite fixes.
      Correct labelling of the allele type throughout the project page and added it to the mutagenesis prediction too. closes #4488
      Move the allele_type method back into the DataSetUtils
      Move the allele_type function into the SeverViewHelpers.
      Flesh out the allele_type helper to cover more of the derivative alleles.
      Refactor the ServerViewHelpers out into smaller module files.
      Re-ordered the WTSI HeatMap columns upon Jacqui's request.
      ...
    Daz Oakley committed Mar 31, 2011
  9. When we have no data to display (for a dataview etc) instead of hidin…

    …g the bubbles entirely, display a generic greyed out one. closes #4407
    Daz Oakley committed Mar 31, 2011
  10. Update the WTSI MGP front-page counts with new logic from Jaqui. refs…

    … #4136
    Daz Oakley committed Mar 31, 2011