Steve,

I actually just meant a `git merge f5bb9e104fdfb3022c3482fad7c7c69edec5bf94`. I was under the mistaken impression you could directly pull a hash reference (which you can't), so I should have said "merge" not "pull". As all that commit inherits directly from the current master, it would have been a fast-forward, so you would have avoided even needing a merge commit.

I've just done that now:


    [uqtdettr@eresearch-tim mytardis-official]$ git log -1
    commit 4afc3004c974269a0deab369ca7f0f7862c32b2e
    Author: Steve Androulakis <steve.androulakis@gmail.com>
    Date:   Mon Jan 30 17:56:57 2012 +1100
    
        Merging branches 'httpendpointauth', 'celery' and
        'seperate_external_js_libraries'.
        
        Conflicts:
            buildout.cfg
            tardis/settings_changeme.py
            tardis/test_settings.py
        
        Conflicts:
        
            buildout.cfg
            tardis/settings_changeme.py
            tardis/test_settings.py
    [uqtdettr@eresearch-tim mytardis-official]$ git reset --hard HEAD~1
    HEAD is now at 238d8be Merge branch 'ryanbraganza_master'
    [uqtdettr@eresearch-tim mytardis-official]$ git fetch tjdett
    remote: Counting objects: 144, done.
    remote: Compressing objects: 100% (44/44), done.
    remote: Total 117 (delta 80), reused 108 (delta 71)
    Receiving objects: 100% (117/117), 18.87 KiB, done.
    Resolving deltas: 100% (80/80), completed with 21 local objects.
    From github.com:tjdett/mytardis
     * [new branch]      celery     -> tjdett/celery
     + b520c67...029b2b9 httpendpointauth -> tjdett/httpendpointauth  (forced update)
       c68f304..238d8be  master     -> tjdett/master
     + 4e2e1fe...f5bb9e1 mirage-uat -> tjdett/mirage-uat  (forced update)
     * [new branch]      seperate_external_js_libraries -> tjdett/seperate_external_js_libraries
    [uqtdettr@eresearch-tim mytardis-official]$ git merge f5bb9e104fdfb3022c3482fad7c7c69edec5bf94

    Updating 238d8be..f5bb9e1
    Fast-forward
     .gitignore                                         |    3 +-
     Procfile                                           |    2 +
     README.rst                                         |    7 +-
     buildout.cfg                                       |    4 +
     docs/ref/auth_framework.rst                        |    5 +-
     docs/ref/auth_httpbasicendpoint.rst                |   35 +++
     tardis/settings_changeme.py                        |   20 ++-
     .../tardis_portal/auth/httpbasicendpoint_auth.py   |   75 ++++++
     tardis/tardis_portal/static/css/default.css        |   41 ++--
     .../{ => lib}/autocomplete/jquery.autocomplete.css |    0
     .../css/{ => lib}/autocomplete/lib/thickbox.css    |    0
     .../static/css/{ => lib}/autocomplete/main.css     |    0
     .../static/css/lib/cc-widget-style.css             |  254 ++++++++++++++++++++
     .../tardis_portal/static/css/{ => lib}/jqmodal.css |    0
     .../redmond/images/ui-bg_flat_0_aaaaaa_40x100.png  |  Bin 180 -> 180 bytes
     .../redmond/images/ui-bg_flat_55_fbec88_40x100.png |  Bin 213 -> 213 bytes
     .../redmond/images/ui-bg_glass_75_d0e5f5_1x400.png |  Bin 124 -> 124 bytes
     .../redmond/images/ui-bg_glass_85_dfeffc_1x400.png |  Bin 155 -> 155 bytes
     .../redmond/images/ui-bg_glass_95_fef1ec_1x400.png |  Bin 119 -> 119 bytes
     .../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png  |  Bin 3457 -> 3457 bytes
     .../images/ui-bg_inset-hard_100_f5f8f9_1x100.png   |  Bin 104 -> 104 bytes
     .../images/ui-bg_inset-hard_100_fcfdfd_1x100.png   |  Bin 88 -> 88 bytes
     .../redmond/images/ui-icons_217bc0_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_2e83ff_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_469bdd_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_6da8d5_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_cd0a0a_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_d8e7f3_256x240.png     |  Bin 4369 -> 4369 bytes
     .../redmond/images/ui-icons_f9bd01_256x240.png     |  Bin 4369 -> 4369 bytes
     .../{ => lib}/redmond/jquery-ui-1.7.2.custom.css   |    0
     .../images/ui-bg_flat_0_aaaaaa_40x100.png          |  Bin 180 -> 180 bytes
     .../images/ui-bg_flat_75_ffffff_40x100.png         |  Bin 178 -> 178 bytes
     .../images/ui-bg_glass_55_fbf9ee_1x400.png         |  Bin 120 -> 120 bytes
     .../images/ui-bg_glass_65_ffffff_1x400.png         |  Bin 105 -> 105 bytes
     .../images/ui-bg_glass_75_dadada_1x400.png         |  Bin 111 -> 111 bytes
     .../images/ui-bg_glass_75_e6e6e6_1x400.png         |  Bin 110 -> 110 bytes
     .../images/ui-bg_glass_95_fef1ec_1x400.png         |  Bin 119 -> 119 bytes
     .../ui-bg_highlight-soft_75_cccccc_1x100.png       |  Bin 101 -> 101 bytes
     .../smoothness/images/ui-icons_222222_256x240.png  |  Bin 4369 -> 4369 bytes
     .../smoothness/images/ui-icons_2e83ff_256x240.png  |  Bin 4369 -> 4369 bytes
     .../smoothness/images/ui-icons_454545_256x240.png  |  Bin 4369 -> 4369 bytes
     .../smoothness/images/ui-icons_888888_256x240.png  |  Bin 4369 -> 4369 bytes
     .../smoothness/images/ui-icons_cd0a0a_256x240.png  |  Bin 4369 -> 4369 bytes
     .../smoothness/jquery-ui-1.7.2.custom.css          |    0
     .../ui-bg_diagonals-thick_55_eee7e7_40x40.png      |  Bin 255 -> 255 bytes
     .../images/ui-bg_dots-small_65_a6a6a6_2x2.png      |  Bin 83 -> 83 bytes
     .../theme/images/ui-bg_flat_0_333333_40x100.png    |  Bin 180 -> 180 bytes
     .../theme/images/ui-bg_flat_65_ffffff_40x100.png   |  Bin 178 -> 178 bytes
     .../theme/images/ui-bg_flat_75_ffffff_40x100.png   |  Bin 178 -> 178 bytes
     .../theme/images/ui-bg_glass_55_fbf8ee_1x400.png   |  Bin 121 -> 121 bytes
     .../ui-bg_highlight-hard_100_eeeeee_1x100.png      |  Bin 94 -> 94 bytes
     .../ui-bg_highlight-hard_100_f6f6f6_1x100.png      |  Bin 89 -> 89 bytes
     .../ui-bg_highlight-soft_15_cc0000_1x100.png       |  Bin 108 -> 108 bytes
     .../theme/images/ui-icons_004276_256x240.png       |  Bin 4379 -> 4379 bytes
     .../theme/images/ui-icons_cc0000_256x240.png       |  Bin 4379 -> 4379 bytes
     .../theme/images/ui-icons_ffffff_256x240.png       |  Bin 4379 -> 4379 bytes
     .../static/css/{ => lib}/theme/ui.accordion.css    |    0
     .../static/css/{ => lib}/theme/ui.all.css          |    0
     .../static/css/{ => lib}/theme/ui.base.css         |    0
     .../static/css/{ => lib}/theme/ui.core.css         |    0
     .../static/css/{ => lib}/theme/ui.datepicker.css   |    0
     .../static/css/{ => lib}/theme/ui.dialog.css       |    0
     .../static/css/{ => lib}/theme/ui.progressbar.css  |    0
     .../static/css/{ => lib}/theme/ui.resizable.css    |    0
     .../static/css/{ => lib}/theme/ui.slider.css       |    0
     .../static/css/{ => lib}/theme/ui.tabs.css         |    0
     .../static/css/{ => lib}/theme/ui.theme.css        |    0
     .../static/js/{ => lib}/flash_detect_min.js        |    0
     .../tardis_portal/static/js/{ => lib}/jqmodal.js   |    0
     .../static/js/{ => lib}/jquery-1.7.min.js          |    0
     .../js/{ => lib}/jquery-ui-1.7.2.custom.min.js     |    0
     .../js/{ => lib}/jquery-ui-1.8.6.custom.min.js     |    0
     .../js/{ => lib}/jquery-ui-personalized-1.6rc6.js  |    0
     .../static/js/{ => lib}/jquery.autocomplete.css    |    0
     .../static/js/{ => lib}/jquery.autocomplete.js     |    0
     .../static/js/{ => lib}/jquery.autocomplete.min.js |    0
     .../js/{ => lib}/jquery.autocomplete.pack.js       |    0
     .../static/js/{ => lib}/jquery.cookie.js           |    0
     .../js/{ => lib}/jquery.customised-formset.js      |    0
     .../static/js/{ => lib}/jstree/jquery.jstree.js    |    0
     .../static/js/{ => lib}/jstree/themes/apple/bg.jpg |  Bin 331 -> 331 bytes
     .../static/js/{ => lib}/jstree/themes/apple/d.png  |  Bin 7765 -> 7765 bytes
     .../{ => lib}/jstree/themes/apple/dot_for_ie.gif   |  Bin 43 -> 43 bytes
     .../js/{ => lib}/jstree/themes/apple/style.css     |    0
     .../js/{ => lib}/jstree/themes/apple/throbber.gif  |  Bin 1849 -> 1849 bytes
     .../js/{ => lib}/jstree/themes/classic/d.png       |  Bin 7535 -> 7535 bytes
     .../{ => lib}/jstree/themes/classic/dot_for_ie.gif |  Bin 43 -> 43 bytes
     .../js/{ => lib}/jstree/themes/classic/style.css   |    0
     .../{ => lib}/jstree/themes/classic/throbber.gif   |  Bin 1849 -> 1849 bytes
     .../js/{ => lib}/jstree/themes/default-rtl/d.gif   |  Bin 2872 -> 2872 bytes
     .../js/{ => lib}/jstree/themes/default-rtl/d.png   |  Bin 7459 -> 7459 bytes
     .../{ => lib}/jstree/themes/default-rtl/dots.gif   |  Bin 132 -> 132 bytes
     .../{ => lib}/jstree/themes/default-rtl/style.css  |    0
     .../jstree/themes/default-rtl/throbber.gif         |  Bin 1849 -> 1849 bytes
     .../js/{ => lib}/jstree/themes/default/d.gif       |  Bin 2944 -> 2944 bytes
     .../js/{ => lib}/jstree/themes/default/d.png       |  Bin 7635 -> 7635 bytes
     .../js/{ => lib}/jstree/themes/default/style.css   |    0
     .../{ => lib}/jstree/themes/default/throbber.gif   |  Bin 1849 -> 1849 bytes
     .../static/js/{ => lib}/uploadify/cancel.png       |  Bin 2960 -> 2960 bytes
     .../js/{ => lib}/uploadify/jquery.uploadify.js     |    0
     .../uploadify/jquery.uploadify.v2.1.4.min.js       |    0
     .../static/js/{ => lib}/uploadify/swfobject.js     |    0
     .../static/js/{ => lib}/uploadify/uploadify.css    |    0
     .../static/js/{ => lib}/uploadify/uploadify.swf    |  Bin 22894 -> 22894 bytes
     tardis/tardis_portal/static/js/main.js             |   78 ++++++
     .../templates/tardis_portal/create_experiment.html |    2 +-
     .../templates/tardis_portal/creative_commons.html  |    6 +-
     .../tardis_portal/javascript_libraries.html        |   25 +-
     .../templates/tardis_portal/portal_template.html   |  101 +--------
     .../tardis_portal/uploadify/multi_file_upload.html |   10 +-
     .../tests/auth/test_httpbasicendpoint_auth.py      |  195 +++++++++++++++
     tardis/tardis_portal/tests/jasmine/files.json      |   12 +
     .../jasmine/fixtures/search_autocomplete.html      |    3 +
     .../jasmine/fixtures/status_message_populated.html |    7 +
     .../fixtures/status_message_unpopulated.html       |    7 +
     tardis/tardis_portal/tests/jasmine/spec/main.js    |   83 +++++++
     tardis/test_settings.py                            |   20 ++-
     tardis/urls.py                                     |    6 +
     118 files changed, 847 insertions(+), 154 deletions(-)
     create mode 100644 docs/ref/auth_httpbasicendpoint.rst
     create mode 100644 tardis/tardis_portal/auth/httpbasicendpoint_auth.py
     rename tardis/tardis_portal/static/css/{ => lib}/autocomplete/jquery.autocomplete.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/autocomplete/lib/thickbox.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/autocomplete/main.css (100%)
     create mode 100644 tardis/tardis_portal/static/css/lib/cc-widget-style.css
     rename tardis/tardis_portal/static/css/{ => lib}/jqmodal.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_flat_55_fbec88_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_glass_85_dfeffc_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_217bc0_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_2e83ff_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_469bdd_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_6da8d5_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_cd0a0a_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_d8e7f3_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/images/ui-icons_f9bd01_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/redmond/jquery-ui-1.7.2.custom.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-icons_222222_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-icons_2e83ff_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-icons_454545_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-icons_888888_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/images/ui-icons_cd0a0a_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/smoothness/jquery-ui-1.7.2.custom.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_diagonals-thick_55_eee7e7_40x40.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_dots-small_65_a6a6a6_2x2.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_flat_0_333333_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_flat_65_ffffff_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_flat_75_ffffff_40x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_glass_55_fbf8ee_1x400.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_highlight-hard_100_eeeeee_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-bg_highlight-soft_15_cc0000_1x100.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-icons_004276_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-icons_cc0000_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/images/ui-icons_ffffff_256x240.png (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.accordion.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.all.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.base.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.core.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.datepicker.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.dialog.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.progressbar.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.resizable.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.slider.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.tabs.css (100%)
     rename tardis/tardis_portal/static/css/{ => lib}/theme/ui.theme.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/flash_detect_min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jqmodal.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery-1.7.min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery-ui-1.7.2.custom.min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery-ui-1.8.6.custom.min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery-ui-personalized-1.6rc6.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.autocomplete.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.autocomplete.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.autocomplete.min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.autocomplete.pack.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.cookie.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jquery.customised-formset.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/jquery.jstree.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/apple/bg.jpg (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/apple/d.png (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/apple/dot_for_ie.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/apple/style.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/apple/throbber.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/classic/d.png (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/classic/dot_for_ie.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/classic/style.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/classic/throbber.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default-rtl/d.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default-rtl/d.png (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default-rtl/dots.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default-rtl/style.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default-rtl/throbber.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default/d.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default/d.png (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default/style.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/jstree/themes/default/throbber.gif (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/cancel.png (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/jquery.uploadify.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/jquery.uploadify.v2.1.4.min.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/swfobject.js (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/uploadify.css (100%)
     rename tardis/tardis_portal/static/js/{ => lib}/uploadify/uploadify.swf (100%)
     create mode 100644 tardis/tardis_portal/static/js/main.js
     create mode 100644 tardis/tardis_portal/tests/auth/__init__.py
     create mode 100644 tardis/tardis_portal/tests/auth/test_httpbasicendpoint_auth.py
     create mode 100644 tardis/tardis_portal/tests/jasmine/files.json
     create mode 100644 tardis/tardis_portal/tests/jasmine/fixtures/search_autocomplete.html
     create mode 100644 tardis/tardis_portal/tests/jasmine/fixtures/status_message_populated.html
     create mode 100644 tardis/tardis_portal/tests/jasmine/fixtures/status_message_unpopulated.html
     create mode 100644 tardis/tardis_portal/tests/jasmine/spec/main.js

    [uqtdettr@eresearch-tim mytardis-official]$ git push -f official master
    Counting objects: 144, done.
    Delta compression using up to 8 threads.
    Compressing objects: 100% (35/35), done.
    Writing objects: 100% (117/117), 18.87 KiB, done.
    Total 117 (delta 80), reused 117 (delta 80)
    To git@github.com:mytardis/mytardis.git
     + 4afc300...f5bb9e1 master -> master (forced update)