Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

RND-288 paragraphs #415

Merged
merged 18 commits into from
Aug 10, 2016
Merged

RND-288 paragraphs #415

merged 18 commits into from
Aug 10, 2016

Conversation

Saphyel
Copy link
Contributor

@Saphyel Saphyel commented Aug 4, 2016

Fixes https://jira.comicrelief.com/browse/RND-288

Todo

  • Fix images
  • Add fundraise to header links

Tests in RND

@Saphyel
Copy link
Contributor Author

Saphyel commented Aug 5, 2016

I think this PR actually makes me think we should refactor our actual code (should affect only to campaign, no harm to RND17)

@Saphyel Saphyel force-pushed the feature/RND-288_paragraphs branch 2 times, most recently from a08e95e to cd0d375 Compare August 8, 2016 12:43
@Saphyel Saphyel added this to the 1.7 milestone Aug 9, 2016
@pvhee
Copy link
Contributor

pvhee commented Aug 9, 2016

@Saphyel conflicts! can you solve

I'm also reviewing the upgrade path in RND

@pvhee
Copy link
Contributor

pvhee commented Aug 9, 2016

@Saphyel happy to get this merged in after conflicts have been resolved, my tests on https://github.com/comicrelief/rnd17/pull/86 are all positive

@Saphyel
Copy link
Contributor Author

Saphyel commented Aug 10, 2016

@pvhee up to date w/ develop!

@pvhee
Copy link
Contributor

pvhee commented Aug 10, 2016

@Saphyel failing!

@pvhee pvhee changed the title (TEST) RND-288 paragraphs RND-288 paragraphs Aug 10, 2016
And I should see "The money you raise will help change lives"
And I should see "Ready to go?"
And I should see "All that's left to do is pre-order your FREE Fundraising Pack"
And I should see the link "Pre-order"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Saphyel we need to keep these tests

@pvhee pvhee merged commit f657d8b into develop Aug 10, 2016
@pvhee pvhee deleted the feature/RND-288_paragraphs branch August 10, 2016 16:56
@Saphyel Saphyel mentioned this pull request Aug 16, 2016
@pvhee pvhee mentioned this pull request Jan 5, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants