Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mas-129 Mas-121 Mas-112 Daily email cards merge #48

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

Mas-129 Mas-121 Mas-112 Daily email cards merge #48

wants to merge 21 commits into from

Commits on Jan 14, 2020

  1. MAS-129 Add MAD fields without branding

    @d-lan1
    d-lan1 committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    4e098d4 View commit details
    Browse the repository at this point in the history

  2. MAS-129 Add Specialities to MAD

    @d-lan1
    d-lan1 committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    0a12a63 View commit details
    Browse the repository at this point in the history

  3. MAS-129 Add tests

    @d-lan1
    d-lan1 committed Jan 14, 2020
    2 Configuration menu
    Copy the full SHA
    697face View commit details
    Browse the repository at this point in the history

  4. MAS-121 Add broader title to evidence type in item api 

    Use JSONLD file to look up the key for the evidence type
when we're exporting items via the single API endpoint
    @d-lan1
    d-lan1 committed Jan 14, 2020
    2 Configuration menu
    Copy the full SHA
    be26ac1 View commit details
    Browse the repository at this point in the history

  5. MAS-129 Fix test and pluralise Item.Speciality

    @d-lan1
    d-lan1 committed Jan 14, 2020
    2 Configuration menu
    Copy the full SHA
    1b4a388 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. MAS-121 Clean up and add mailcontroller tests

    @d-lan1
    d-lan1 committed Jan 15, 2020
    2 Configuration menu
    Copy the full SHA
    fb9a9cc View commit details
    Browse the repository at this point in the history

  2. Working on mailservice integration tests

    @d-lan1
    d-lan1 committed Jan 15, 2020
    2 Configuration menu
    Copy the full SHA
    dda5c61 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2020

  1. MAS-129 Reafctor tests

    @ediblecode
    ediblecode committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    7804e5c View commit details
    Browse the repository at this point in the history

  2. MASD-129 Add mailchimp template

    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    c94036c View commit details
    Browse the repository at this point in the history

  3. MAS-129 Fix JS linting errors

    @ediblecode
    ediblecode committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    ef4e6b2 View commit details
    Browse the repository at this point in the history

  4. MAS-129 Test getting items for specific date

    @d-lan1
    d-lan1 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    78f6c65 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'MAS-129_121__112_Daily_Email' of https://github.com/nhs… 

    …evidence/MAS into MAS-129_121__112_Daily_Email
    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    8b643c5 View commit details
    Browse the repository at this point in the history

  6. MAS-129 Add styling and branding to daily email

    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    130f2b7 View commit details
    Browse the repository at this point in the history

  7. MAS-129 Add 'send me everything' option to daily email

    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    3261e88 View commit details
    Browse the repository at this point in the history

  8. MAS-129 Layout template fixes 

    Remove Sharelinks from daily layout
Add link styling fix in daily email via daily layout
    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    a8b6683 View commit details
    Browse the repository at this point in the history

  9. MAS-129 Add daily items endpoint in CMS

    @ediblecode
    ediblecode committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    a367366 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'MAS-129_121__112_Daily_Email' of github.com:nice-digita… 

    …l/MAS into MAS-129_121__112_Daily_Email
    @ediblecode
    ediblecode committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    e18952a View commit details
    Browse the repository at this point in the history

  11. MAS-129 Update mailchimp template daily

    @d-lan1
    d-lan1 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    8137313 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'MAS-129_121__112_Daily_Email' of https://github.com/nhs… 

    …evidence/MAS into MAS-129_121__112_Daily_Email
    @d-lan1
    d-lan1 committed Jan 16, 2020
    2 Configuration menu
    Copy the full SHA
    bbe0299 View commit details
    Browse the repository at this point in the history

  13. MAS-129 Update DailyEmail.cshtml

    @d-lan1
    d-lan1 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    242f5e2 View commit details
    Browse the repository at this point in the history

  14. MAS-129 DailyEmail generation

    @d-lan1
    d-lan1 committed Jan 16, 2020
    6 Configuration menu
    Copy the full SHA
    e2700db View commit details
    Browse the repository at this point in the history