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

as a user, i want documentation about chain of custody, so that i know my funds are secure #1913

Merged
merged 3 commits into from
Aug 2, 2018

Conversation

owocki
Copy link
Contributor

@owocki owocki commented Aug 2, 2018

Description

as a user, i want documentation about chain of custody, so that i know my funds are secure.

all links go to the documentation about chain of custody

screen shot 2018-08-01 at 9 00 00 pm

screen shot 2018-08-01 at 8 59 56 pm

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing

tested it, just a ui change

Refers/Fixes

https://gitcoincore.slack.com/archives/CAXFMVDGD/p1533176973000114?thread_ts=1533051885.000109&cid=CAXFMVDGD

@codecov
Copy link

codecov bot commented Aug 2, 2018

Codecov Report

Merging #1913 into master will increase coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1913      +/-   ##
==========================================
+ Coverage   25.47%   25.61%   +0.13%     
==========================================
  Files         130      130              
  Lines       10530    10781     +251     
  Branches     1405     1472      +67     
==========================================
+ Hits         2683     2762      +79     
- Misses       7770     7935     +165     
- Partials       77       84       +7
Impacted Files Coverage Δ
app/app/urls.py 86.04% <0%> (-3.96%) ⬇️
app/retail/emails.py 22.39% <0%> (+2.14%) ⬆️
app/marketing/mails.py 16.88% <0%> (+5.09%) ⬆️

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 b2fb1d0...3fadaff. Read the comment docs.

Copy link
Contributor

@mbeacom mbeacom left a comment

Choose a reason for hiding this comment

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

@owocki Other than the inline conflict blocks <<<<, ====, >>>>, lgtm. Can we resolve the updated upstream/stashed changes entries? Following that, should be good to go.

@@ -128,3 +129,133 @@ <h3>{% trans "with instructions about how to receive their tip." %}</h1>
</div>
</section>
{% endblock %}
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

conflicts inline

@owocki
Copy link
Contributor Author

owocki commented Aug 2, 2018

thats what i get for coding this on the bus after a beer or two :)

fixed the conflicts; merging now

@owocki owocki merged commit cf419a4 into master Aug 2, 2018
@thelostone-mc thelostone-mc deleted the kevin/security-docs branch December 28, 2018 20:09
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.

2 participants