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

HOLD: releases iOS landing page link - DO NOT MERGE UNTIL IOS APP IS READY #1167

Merged
merged 3 commits into from
Jun 18, 2018

Conversation

owocki
Copy link
Contributor

@owocki owocki commented May 15, 2018

No description provided.

@codecov
Copy link

codecov bot commented May 15, 2018

Codecov Report

Merging #1167 into master will decrease coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1167      +/-   ##
==========================================
- Coverage   30.28%   30.21%   -0.08%     
==========================================
  Files         125      125              
  Lines        9096     9215     +119     
  Branches     1166     1196      +30     
==========================================
+ Hits         2755     2784      +29     
- Misses       6232     6321      +89     
- Partials      109      110       +1
Impacted Files Coverage Δ
app/retail/views.py 38.78% <0%> (-0.63%) ⬇️
app/dashboard/views.py 16.35% <0%> (+0.74%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13720b3...1538682. Read the comment docs.

@mbeacom
Copy link
Contributor

mbeacom commented May 15, 2018

Added the dont merge label to this.

@mbeacom mbeacom added the frontend This needs frontend expertise. label May 15, 2018
@mbeacom mbeacom changed the title releases iOS landing page link - DO NOT MERGE UNTIL IOS APP IS READY HOLD: releases iOS landing page link - DO NOT MERGE UNTIL IOS APP IS READY Jun 7, 2018
@owocki owocki mentioned this pull request Jun 12, 2018
3 tasks
@owocki
Copy link
Contributor Author

owocki commented Jun 12, 2018

ios app is ready to go!

@owocki
Copy link
Contributor Author

owocki commented Jun 12, 2018

we need to decide when to pus hthis all out!

@thelostone-mc
Copy link
Member

@owocki
Refactored + Cleaned up code + Ensured responsive design across devices

screen shot 2018-06-13 at 4 59 39 pm

mbeacom
mbeacom previously approved these changes Jun 13, 2018
@@ -17,5 +17,5 @@
{% endcomment %}
{% load i18n %}
<div class="row bottom_notification font-caption">
{% blocktrans %}<strong>2018 June 8</strong> - Have you seen our <a style="margin-right: 5px;" href="https://medium.com/gitcoin/tutorial-how-to-price-work-on-gitcoin-49bafcdd201e" target="_blank" rel="noopener noreferrer">Tutorial on How to Price Work on Gitcoin</a>?{% endblocktrans %}
{% blocktrans %}<strong>2018 June 15</strong> -{% trans "Browse funded work in OSS on the go. Check out the " %} <a style="margin-right: 5px;" href="https://gitcoin.co/ios">Gitcoin iOS app</a>!{% endblocktrans %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

django.template.exceptions.TemplateSyntaxError: 'blocktrans' doesn't allow other block tags (seen 'trans "Browse funded work in OSS on the go. Check out the "') inside it

@thelostone-mc

Copy link
Member

Choose a reason for hiding this comment

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

derp derp! happened during the rebase
Fixed

@owocki owocki merged commit 254dccd into master Jun 18, 2018
@ghost ghost removed the in progress label Jun 18, 2018
@mbeacom mbeacom deleted the ios_release branch June 18, 2018 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dont merge frontend This needs frontend expertise.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants