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.

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

New content for getting started, about, and nav menu #698

Merged
merged 4 commits into from
Oct 27, 2017

Conversation

jessmc
Copy link
Contributor

@jessmc jessmc commented Oct 11, 2017

In this pull request:

  • Created the page Getting Started with some content and youtube video 'Welcome to TaxBrain'
  • Added youtube video 'Welcome to Open Source Policy Center' to about page between 'Our Mission' and 'Our History'
  • Made link changes to the navigation menu in the header

Thank you!

@MattHJensen
Copy link
Contributor

MattHJensen commented Oct 13, 2017

Thanks for this one, too. Also early next week for feedback.

@MattHJensen MattHJensen changed the title Engage - Jessica Ciarelli New content for getting started, about, and nav menu Oct 13, 2017
@hdoupe
Copy link
Collaborator

hdoupe commented Oct 27, 2017

@jessmc We moved all of the flatblock contents from the django admin portion of the site into the repo. It looks like there is a small merge conflict. I tried to resolve it but it doesn't look like that changed anything. Would you mind taking a look at this before I break something?

Otherwise, this looks great. We are pushing a new version of PolicyBrain to the test server today. So, if you could resolve this by 3 or 4 PM EST that would be great. If not, I should be able to resolve the conflict.

cc @MattHJensen @mikejpratt

@jessmc
Copy link
Contributor Author

jessmc commented Oct 27, 2017

Hi @hdoupe ! I just took a look and think I was able to resolve the conflict. Please let me know if this helps, and if you need anything else from me!
Thanks,
Jessica

@hdoupe
Copy link
Collaborator

hdoupe commented Oct 27, 2017

@jessmc Looks great. Thanks for the quick response!

@hdoupe hdoupe merged commit e50e319 into ospc-org:master Oct 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants