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

Gitcoin docs fixes #5468

Merged
merged 5 commits into from
Nov 13, 2019
Merged

Gitcoin docs fixes #5468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c19d433
Gitcoin docs spelling correction
sergej-mueller Sep 4, 2019
a605cb2
Fixed HTML markup on email campaign
sergej-mueller Sep 4, 2019
718f5d9
Fixed Slack link on the contributing page
sergej-mueller Sep 4, 2019
320c344
Merge pull request #1 from sergejmueller/gitcoin-docs-fixes
sergejmueller Nov 7, 2019
ea95676
akudos -> a kudos
sergejmueller Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions app/retail/templates/emails/campaigns/email_campaign_day_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,23 @@ <h1>Day 1: Growing Open Source</h1>
{% blocktrans %}
As time passes, we’ll send you more ways to get involved in Gitcoin. For now, we have a few areas you can nerd out with us, depending on where you’re most comfortable.
<ul>
<li><a href="http://gitcoin.co/slack">Join the Slack channel</a> and say hi on #community-intros! </li>
<li><a href="http://twitter.com/gitcoin">Follow us on Twitter</a> for updates on open source software. </li>
<li><a href="https://www.youtube.com/channel/UCeKRqRjzSzq5yP-zUPwc6_w/featured">Add the Gitcoin Livestream to your cal (<a hred="https://calendar.google.com/calendar/ical/7rq7ga2oubv3tk93hk67agdv88%40group.calendar.google.com/public/basic.ics">iCal</a>, <a href="https://calendar.google.com/calendar/hosted/consensys.net/event?action=TEMPLATE&hl=en&text=Gitcoin%20Community%20Livestream&dates=20180427T160000%2F20180427T173000&location=https%3A%2F%2Fconsensys.zoom.us%2Fj%2F385625394&ctz=America%2FChicago&details">Google</a>) for Friday at 5PM EST. We’ll have two weekly product demo’s from the blockchain & open source ecosystems (like <a href="https://www.youtube.com/watch?v=E9c-6nlYyVo&pbjreload=10">Decentraland</a> and <a href="https://www.youtube.com/watch?v=EkZHTzGJMcY">Meta Transactions</a> with Austin Griffith.
</li>
<li><a href="https://gitcoin.co/slack">Join the Slack channel</a> and say hi on #community-intros! </li>
<li><a href="https://twitter.com/gitcoin">Follow us on Twitter</a> for updates on open source software. </li>
<li><a href="https://www.youtube.com/channel/UCeKRqRjzSzq5yP-zUPwc6_w/featured">Add the Gitcoin Livestream</a> to your cal (<a href="https://calendar.google.com/calendar/ical/7rq7ga2oubv3tk93hk67agdv88%40group.calendar.google.com/public/basic.ics">iCal</a>, <a href="https://calendar.google.com/calendar/hosted/consensys.net/event?action=TEMPLATE&hl=en&text=Gitcoin%20Community%20Livestream&dates=20180427T160000%2F20180427T173000&location=https%3A%2F%2Fconsensys.zoom.us%2Fj%2F385625394&ctz=America%2FChicago&details">Google</a>) for Friday at 5PM EST. We’ll have two weekly product demo’s from the blockchain & open source ecosystems (like <a href="https://www.youtube.com/watch?v=E9c-6nlYyVo&pbjreload=10">Decentraland</a> and <a href="https://www.youtube.com/watch?v=EkZHTzGJMcY">Meta Transactions</a> with Austin Griffith.</li>
</ul>
{% endblocktrans %}

</p>

<p>
{% blocktrans %}
Oh, and <a href="https://gitcoin.co/kudos/redeem/onboardingtree_01302019">here’s akudos</a> for getting to the bottom of this e-mail :) welcome to the Gitcoin Family!
Oh, and <a href="https://gitcoin.co/kudos/redeem/onboardingtree_01302019">here’s a kudos</a> for getting to the bottom of this e-mail :) welcome to the Gitcoin Family!
{% endblocktrans %}

</p>
<p>
{% blocktrans %}
See you on the interwebs,
See you on the interwebs,
{% endblocktrans %}
</p>

Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/settings/matching.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h5>{% trans "Matching Preferences" %}</h5>
<div class="form-group">
<label class="form__label" for="keywords">{% trans "Programming languages" %}</label>
<a href="#" id="pull_gh">{% trans "(pull from github)" %}</a>
<input type="text" name="keywords" class="form__input" placeholder='comma, seperated, list' value="{{ keywords }}">
<input type="text" name="keywords" class="form__input" placeholder='comma, separated, list' value="{{ keywords }}">
<small id="kwHelp" class="form__input-help">{% trans "so we know what funded work to route your way" %}</small>
</div>
{% csrf_token %}
Expand Down
2 changes: 1 addition & 1 deletion docs/API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ The bounties endpoint provides a listing of bounties and their current status. T

**Filters**

You can filter the data returned from the API by providing these keys as URL parameters `experience_level`, `project_length`, `bounty_type`, `bounty_owner_address`, `is_open`, and `github_url`. `github_url` can take a comma-seperated list of GitHub urls
You can filter the data returned from the API by providing these keys as URL parameters `experience_level`, `project_length`, `bounty_type`, `bounty_owner_address`, `is_open`, and `github_url`. `github_url` can take a comma-separated list of GitHub urls

**Order By**

Expand Down
4 changes: 2 additions & 2 deletions docs/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ When you [open an issue](https://github.com/gitcoinco/web), you'll notice four t
## Discussions And General Help

As Gitcoin is still at its early stages, drop by
[gitcoin.co/slack](gitcoin.co/slack) and say hi to know what's next / to get
[gitcoin.co/slack](https://gitcoin.co/slack) and say hi to know what's next / to get
your answers cleared up.

## Pull Requests
Expand Down Expand Up @@ -230,7 +230,7 @@ def foo(bar='bar'):
bar (str): The foo suffix. Defaults to: bar.

Attributes:
foobar (str): The foo string concatentated with the provided bar variable.
foobar (str): The foo string concatenated with the provided bar variable.

Returns:
str: The concatenated string.
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Technically, the system is architected:
If you

* have some work on your Github Issues board that you don't have time (or skills) to do.
* are dependant upon an upstream repo for something, and you'd like to incentivize them to work onit.
* are dependant upon an upstream repo for something, and you'd like to incentivize them to work on it.

try posting a funded issue at [https://gitcoin.co/new](https://gitcoin.co/new).

Expand Down Expand Up @@ -191,7 +191,7 @@ We may introduce Arbitration [via Delphi](http://delphi.network/) at some point
#### Showing Support to Individuals

- via [Tips](https://gitcoin.co/tips)
- A free, fast way to show immediate gratitude towards an individual via github username or email adress
- A free, fast way to show immediate gratitude towards an individual via github username or email address

- via [Kudos](https://gitcoin.co/kudos)
- Showcases special skills and appreciation towards other Gitcoin members.
Expand Down
4 changes: 2 additions & 2 deletions docs/STYLEGUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ Container has a fade in animation when it becomes into viewport.

_values_

`data-fade-direction`: `left` | `mid` | `right` _(defaut: `mid`)_
`data-fade-direction`: `left` | `mid` | `right` _(default: `mid`)_
`data-fade-duration`: `Number` _(default: `1500`)_

_usage_

```<div class="g-fadein" data-fade-duration=1000 data-fade-direction="mid">```
```<div class="g-fadein" data-fade-duration=1000 data-fade-direction="mid">```