Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

Remove trademark notice #299

Open
wants to merge 146 commits into
base: master
Choose a base branch
from
Open

Remove trademark notice #299

wants to merge 146 commits into from

Commits on Jan 8, 2020

  1. Merge pull request #230 from torchbox/heroku-move-2 

    Heroku move 2
    @kevinhowbrook
    kevinhowbrook authored Jan 8, 2020
    Configuration menu
    Copy the full SHA
    be66682 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #232 from torchbox/heroku-move-2 

    Missing rca_login setting
    @kevinhowbrook
    kevinhowbrook authored Jan 8, 2020
    Configuration menu
    Copy the full SHA
    7103e98 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. Merge pull request #234 from torchbox/update-wsgi 

    Update wsgi
    @kevinhowbrook
    kevinhowbrook authored Jan 9, 2020
    Configuration menu
    Copy the full SHA
    3cbaaf1 View commit details
    Browse the repository at this point in the history

  2. Merge branch '1032-form-amendments' into staging

    Tom Readings committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    3121d43 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Get intranet push URL from heroku config

    Tom Readings committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    5251e6d View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. Merge branch 'bug/image-path' into staging

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    a12b21d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://git.heroku.com/rca-verdant-staging i… 

    …nto staging
    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    f5f2d19 View commit details
    Browse the repository at this point in the history

  3. Expose show_on_homepage so we can filter content through the api

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    6cc7f3b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #242 from torchbox/feature/api-updates-for-new-site 

    Feature/api updates for new site
    @kevinhowbrook
    kevinhowbrook authored Jan 17, 2020
    Configuration menu
    Copy the full SHA
    269c14f View commit details
    Browse the repository at this point in the history

  5. So we can use the social image over the api

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    cee3c16 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/api-updates-for-new-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    49fb48b View commit details
    Browse the repository at this point in the history

  7. typo

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    aedb708 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/api-updates-for-new-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    9b11c77 View commit details
    Browse the repository at this point in the history

  9. Add a negated filter option to the api filters

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    5316f21 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/api-updates-for-new-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    6a4f21b View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2020

  1. Larger size image needed

    @kevinhowbrook
    kevinhowbrook committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    28ae267 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2020

  1. Merge branch 'feature/api-updates-for-new-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    5b7dc6b View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Merge pull request #245 from torchbox/feature/133-sitemap 

    Add wagtail sitemap
    @kevinhowbrook
    kevinhowbrook authored Jan 30, 2020
    Configuration menu
    Copy the full SHA
    36d5ecc View commit details
    Browse the repository at this point in the history

  2. Trigger deployment via ci with empty commit

    @kevinhowbrook
    kevinhowbrook committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    0f264e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. Merge pull request #246 from torchbox/feature/133-sitemap 

    Add a custom sitemap so we can pagingate with older version of wagtail
    @kevinhowbrook
    kevinhowbrook authored Jan 31, 2020
    Configuration menu
    Copy the full SHA
    6c40dff View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Use the site.hostname value for the index view rather than the domain… 

    … from the request so the full path is correct
    kevinhowbrook committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    345a696 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/133-sitemap' into staging

    kevinhowbrook committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    2ad66bd View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    0502f2d View commit details
    Browse the repository at this point in the history

  2. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    fc376c4 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    45d27bc View commit details
    Browse the repository at this point in the history

  4. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    66b2ada View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    b992e9b View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. Update convocation live stream code for 2020

    @kaedroho
    kaedroho committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    151cacb View commit details
    Browse the repository at this point in the history

  2. Revert "Switch from qgtunnel to internal TCP Proxy tool" 

    This reverts commit 52031b7.
    @kaedroho
    kaedroho committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    e98770c View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Revert "Revert "Switch from qgtunnel to internal TCP Proxy tool"" 

    This reverts commit e98770c.
    kevinhowbrook committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    07d5790 View commit details
    Browse the repository at this point in the history

  2. So the CI can use postgres

    kevinhowbrook committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    d66a9a8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #251 from torchbox/switch_to_tcpproxy 

    So the CI can use postgres
    @kevinhowbrook
    kevinhowbrook authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    de01a9a View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    607c85a View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Merge branch 'feature/1046-scout-apm' into staging 

    * feature/1046-scout-apm:
  Add scout apm to the project fix postgres in testing
  Revert "Switch from qgtunnel to internal TCP Proxy tool"
  Update convocation live stream code for 2020 (#250)
  Typo
  Better formatting for the comment
  Use the site.hostname value for the index view rather than the domain
  Larger size image needed
  Add a negated filter option to the api filters
  typo
  So we can use the social image over the api
  Expose show_on_homepage so we can filter content through the api
    Cameron Lamb committed Feb 20, 2020
    Configuration menu
    Copy the full SHA
    13a5f80 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    50a49f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Merge branch '4345-gunicorn-timeout' into staging

    kevinhowbrook committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    848f89d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    5ac3d63 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Merge branch '1051-1052-ap-integration' into staging

    Tom Readings committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    a506585 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'switch_to_tcp_proxy' into staging

    @kevinhowbrook
    kevinhowbrook committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    7bd6d09 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge branch 'pip-appconf' into staging

    @kevinhowbrook
    kevinhowbrook committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    6046e43 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge branch 'cache-settings-if-error' into staging

    @kevinhowbrook
    kevinhowbrook committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    2d9d524 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. Merge remote-tracking branch 'origin/feature/179-populate-nav' into s… 

    …taging

# Conflicts:
#	django-verdant/rcasite/settings/base.py
    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    80ac5aa View commit details
    Browse the repository at this point in the history

  2. Adding js for staging site

    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    6c2a6a9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/feature/179-populate-nav' into s… 

    …taging

# Conflicts:
#	django-verdant/rca/templates/rca/base.html
    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    aa97a1d View commit details
    Browse the repository at this point in the history

  4. Moving js order - staging js debug

    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    0c2600b View commit details
    Browse the repository at this point in the history

  5. Semi colon after `

    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    f40711c View commit details
    Browse the repository at this point in the history

  6. More compressor issues

    @nicklee
    nicklee committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    77d8fa3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/179-new-navigation-rendering' into staging

    @kevinhowbrook
    kevinhowbrook committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    4255368 View commit details
    Browse the repository at this point in the history

  8. Migitate CVE-2020-11001 by disabling revision comparison feature

    @Stormheg
    Stormheg committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    cef824a View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge branch 'staging' of https://github.com/torchbox/verdant-rca int… 

    …o staging
    @kevinhowbrook
    kevinhowbrook committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    5e5bd10 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/179-new-navigation-rendering' into staging

    @kevinhowbrook
    kevinhowbrook committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    006e42d View commit details
    Browse the repository at this point in the history

  3. Deploy staging via CI

    @kevinhowbrook
    kevinhowbrook committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    112d22b View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Merge branch 'bug/422-noisy-logs' into staging

    @kevinhowbrook
    kevinhowbrook committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    7d265fa View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Add an override MA value

    @kevinhowbrook
    kevinhowbrook committed May 7, 2020
    Configuration menu
    Copy the full SHA
    86a166a View commit details
    Browse the repository at this point in the history

  2. Merge branch '1027-ma-override' into staging

    @kevinhowbrook
    kevinhowbrook committed May 7, 2020
    Configuration menu
    Copy the full SHA
    19a6e30 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @helenb
    helenb committed May 14, 2020
    Configuration menu
    Copy the full SHA
    680baac View commit details
    Browse the repository at this point in the history

  2. Merge branch '1066-accessibility-audit-changes' into staging

    @helenb
    helenb committed May 14, 2020
    Configuration menu
    Copy the full SHA
    ec4cbe3 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed May 14, 2020
    Configuration menu
    Copy the full SHA
    18783c9 View commit details
    Browse the repository at this point in the history

  4. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @helenb
    helenb committed May 14, 2020
    Configuration menu
    Copy the full SHA
    4a2b883 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. update menu markup so it's now activated on click rather than hover

    @chris-lawton
    chris-lawton committed May 15, 2020
    Configuration menu
    Copy the full SHA
    db34d11 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. match focus styles on main site

    @chris-lawton
    chris-lawton committed May 22, 2020
    Configuration menu
    Copy the full SHA
    36af3c7 View commit details
    Browse the repository at this point in the history

  2. Merge branch '425-update-menu' into staging

    @chris-lawton
    chris-lawton committed May 22, 2020
    Configuration menu
    Copy the full SHA
    d6cb4c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Bug found on search page - page_url won't work here

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    c44ed77 View commit details
    Browse the repository at this point in the history

  2. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    12ffc01 View commit details
    Browse the repository at this point in the history

  3. CI fixing

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    2a9ebaf View commit details
    Browse the repository at this point in the history

  4. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    b409b41 View commit details
    Browse the repository at this point in the history

  5. Switch to buster to resolve ldap install errors

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    ba6ee11 View commit details
    Browse the repository at this point in the history

  6. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    9484a95 View commit details
    Browse the repository at this point in the history

  7. Fix jessie backports

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    64c7e23 View commit details
    Browse the repository at this point in the history

  8. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    b8d3708 View commit details
    Browse the repository at this point in the history

  9. Fix jessie backports

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7cee8df View commit details
    Browse the repository at this point in the history

  10. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    448c52b View commit details
    Browse the repository at this point in the history

  11. Try circle ci fix for backports

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    468bee6 View commit details
    Browse the repository at this point in the history

  12. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7eb704d View commit details
    Browse the repository at this point in the history

  13. Try stretch instead

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    f43a6ab View commit details
    Browse the repository at this point in the history

  14. Merge branch '1033-add-breadcrumb-to-legacy-site' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    ef38156 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'ci-fixes' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    03e5fb2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Trigger ci build via empty commit

    @kevinhowbrook
    kevinhowbrook committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    0547215 View commit details
    Browse the repository at this point in the history

  2. replicate desktop menu functionality on mobile - 467

    @chris-lawton
    chris-lawton committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    b201929 View commit details
    Browse the repository at this point in the history

  3. Merge branch '425-update-menu' into staging

    @chris-lawton
    chris-lawton committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    ef83805 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ci-fixes' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    46162a4 View commit details
    Browse the repository at this point in the history

  5. Trigger CI deployment

    @kevinhowbrook
    kevinhowbrook committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    ee5bad6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ci-fixes' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    9b07b9d View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Allow filtering of page results by tag in the API

    @ababic
    ababic committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    745acdd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'filter/456-api-filter-pages-by-tag' into staging

    @ababic
    ababic committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    0602579 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Add tagging to NewsItem and EventItem models

    @ababic
    ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    e23e972 View commit details
    Browse the repository at this point in the history

  2. Migration for tag fields

    @kevinhowbrook
    kevinhowbrook committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f78e18c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/456-add-news-event-tags' into staging

    @ababic
    ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ee2f6a7 View commit details
    Browse the repository at this point in the history

  4. Add an override MA value

    @kevinhowbrook @ababic
    kevinhowbrook authored and ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    75aae20 View commit details
    Browse the repository at this point in the history

  5. Add needed merge migration to re-balance staging site

    @kevinhowbrook
    kevinhowbrook committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    9575fa8 View commit details
    Browse the repository at this point in the history

  6. Merge branch '1027-ma-override' into staging

    @ababic
    ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    fd32863 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/455-staff-student-relationship' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    2ae410d View commit details
    Browse the repository at this point in the history

  8. Add 'tags' to api_fields for NewsItem and EventItem

    @ababic
    ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    0465939 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/456-apl-activate-tag-filtering-for-news-and-eve… 

    …nts' into staging
    @ababic
    ababic committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    40dfb4c View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge branch 'feature/455-staff-student-relationship' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    b2b1f69 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Merge branch 'master' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    614a5a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/455-staff-student-relationship' into staging

    @kevinhowbrook
    kevinhowbrook committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    3712793 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

  1. Add templatetag that gets the site-wide alert data from the API

    Cameron Lamb committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    7cf1f47 View commit details
    Browse the repository at this point in the history

  2. Fix imports and check if the API BASE URL is set

    Cameron Lamb committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    59a567d View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. add new sitewide alert FE with the same code (updated for less) from … 

    …RCA rebuild
    jane.hughes committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    31367b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Merge branch '1051-1052-ap-integration' into staging 

    * 1051-1052-ap-integration:
  Make the Company Name field required
  Only show booking/enquiry links if enquiry/booking pages are published.
    Cameron Lamb committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    86cb7f4 View commit details
    Browse the repository at this point in the history

  2. Fix the caching code/logic

    Cameron Lamb committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    5a40408 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  Fix the caching code/logic
  Fix imports and check if the API BASE URL is set
  Add templatetag that gets the site-wide alert data from the API
  replicate desktop menu functionality on mobile - 467
  match focus styles on main site
  update menu markup so it's now activated on click rather than hover
  Try no_output_timeout instead
    Cameron Lamb committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    f88aaa3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Merge branch 'feature/1069-sitewide-alert' into feature/1069-sitewide… 

    …-alert-FE

* feature/1069-sitewide-alert:
  Fix the caching code/logic
    jane.hughes committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    2615366 View commit details
    Browse the repository at this point in the history

  2. update FE for sitewide alert

    jane.hughes committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    1d445b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #281 from torchbox/feature/1069-sitewide-alert-FE 

    [1069] Site-wide overlay alert message (FE)
    @janehughes
    janehughes authored Jun 24, 2020
    Configuration menu
    Copy the full SHA
    8fc3026 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  update FE for sitewide alert
  add new sitewide alert FE with the same code (updated for less) from RCA rebuild

# Conflicts:
#	django-verdant/rca/static/rca/css/core.less
#	django-verdant/rca/templates/rca/base.html
    jane.hughes committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    2158cec View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Remove empty headings from student pages by checking existence of fie… 

    …lds before outputting markup. Remove commented out code.
    @helenb
    helenb committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    6e14be0 View commit details
    Browse the repository at this point in the history

  2. Fix heading structure on student pages

    @helenb
    helenb committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    01bcf14 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. Merge branch '1075-remove-student-character-limits' into staging 

    # Conflicts:
#	django-verdant/rca/models.py
    Tom Readings committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    becd389 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. update sitewide alert to match styles of new rca site

    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    6dfc5fb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  update sitewide alert to match styles of new rca site
    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    2916878 View commit details
    Browse the repository at this point in the history

  3. update rich text formatting

    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    06f3d7b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  update rich text formatting
    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    260d715 View commit details
    Browse the repository at this point in the history

  5. change font family for close button

    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    14ffde6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  change font family for close button
    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    d1d92ed View commit details
    Browse the repository at this point in the history

  7. update font of action link

    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    c83b3fe View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  update font of action link
    jane.hughes committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    ad026d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Only output an email address for staff if one exists

    @helenb
    helenb committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    1f57411 View commit details
    Browse the repository at this point in the history

  2. Missing / duplicate alt text 

    - set alt text to empty for staff / student pictures where their name is immediately below
- Set empty alt text for all instances of the placeholder image
- Remove a completely unused template for related staff
    @helenb
    helenb committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    5e1a7d4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/508-accessibility-updates' into staging

    @chris-lawton
    chris-lawton committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    be37bf0 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Swap dt and dd tags

    @helenb
    helenb committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    8269e80 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Merge remote-tracking branch 'origin/master' into 1076-further-access… 

    …ibility-issues
    @helenb
    helenb committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    fb76787 View commit details
    Browse the repository at this point in the history

  2. Further fixes to definition lists

    @helenb
    helenb committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    c1a2968 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. Merge branch '1076-further-accessibility-issues' into staging

    @helenb
    helenb committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    b15203b View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. Merge branch 'ldap-ci-fix' into staging

    @kevinhowbrook
    kevinhowbrook committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    4fbad0c View commit details
    Browse the repository at this point in the history

  2. Merge branch '1052-ap-enquiry-form-only' into staging

    Tom Readings committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    4222985 View commit details
    Browse the repository at this point in the history

  3. Typo and lint README 

    This was just to trigger a rebuid/release via CircleCI
    Tom Readings committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    3d33c46 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Fudge to ensure that if there are no details on the left of a student… 

    … page, the meta information still sits on the right
    @helenb
    helenb committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    607cbb3 View commit details
    Browse the repository at this point in the history

  2. Merge branch '1076-further-accessibility-issues' into staging

    @helenb
    helenb committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    c5d7ac8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/staging' into staging

    @helenb
    helenb committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    6fd23e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge branch 'fix/501-legacy-menu-bugs' into staging

    @chris-lawton
    chris-lawton committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    75667e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/501-legacy-menu-bugs' into staging

    @chris-lawton
    chris-lawton committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    2dd65cc View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge remote-tracking branch 'origin/fix/form-js-bug' into staging

    @nicklee
    nicklee committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    c2fdfa1 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. add default display: none, to hide popup unless cookie isn't present

    jane.hughes committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    9e05bfa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/1069-sitewide-alert' into staging 

    * feature/1069-sitewide-alert:
  add default display: none, to hide popup unless cookie isn't present
    jane.hughes committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    c4e3b2d View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge branch '1074-richtext-sanitisation' into staging

    @kevinhowbrook
    kevinhowbrook committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    e0c4211 View commit details
    Browse the repository at this point in the history

  2. Merge migrations for staging

    @kevinhowbrook
    kevinhowbrook committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    869a621 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1074-richtext-sanitisation' into staging

    @kevinhowbrook
    kevinhowbrook committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    7270b00 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. Merge branch 'fix/1076-staff-work-images' into staging

    @chris-lawton
    chris-lawton committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    57e54e0 View commit details
    Browse the repository at this point in the history

  2. merge migrations

    @chris-lawton
    chris-lawton committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    30df55d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix/1076-staff-work-images' into staging

    @chris-lawton
    chris-lawton committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    d60e03b View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. Merge branch 'bug/1089-social-link' into staging

    @kevinhowbrook
    kevinhowbrook committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    0418b41 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. Merge branch 'feature/1073-author-fix' into staging

    @kevinhowbrook
    kevinhowbrook committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    c630f28 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. Modify event date filter to include events which have begun but not y… 

    …et finished
    @alxbridge
    alxbridge committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    d523298 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Remove trademark notice from site footer

    @alxbridge
    alxbridge committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    eea2e65 View commit details
    Browse the repository at this point in the history