Skip to content

Commit 0b140c5

Browse files
authored
Merge branch 'master' into adoption-stats
2 parents c0b70ce + 8df143d commit 0b140c5

16 files changed

+45
-41
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ Gemfile.lock
1313
scripts/python/output/
1414
.bundle
1515
vendor/
16-
.jekyll-metadata
16+
.jekyll-metadata
17+
vendor/bundle/
18+
vendor/*

.travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ jobs:
6969
on:
7070
branch: master
7171
allow_failures:
72-
script:
73-
bundle exec rake external
72+
- stage: Test
73+
script:
74+
bundle exec rake external
75+
if: type IN (pull_request, cron)
7476
notifications:
7577
webhooks: https://www.travisbuddy.com/
7678
slack:

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ task proof_external: 'build' do
3434
url_ignore: ['/add'], \
3535
http_status_ignore: [0, 301, 302, 403, 503], \
3636
cache: { timeframe: '1w' }, \
37-
hydra: { max_concurrency: 25 }
37+
hydra: { max_concurrency: 20 }
3838
).run
3939
end
4040

_data/cloud.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ websites:
1616
url: https://bithost.io/
1717
img: bithost.png
1818
bch: No
19+
btc: Yes
20+
othercrypto: Yes
1921
twitter: bithostio
2022
email_address: [email protected]
2123

_data/cryptoservices.yml

-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ websites:
344344
bch: Yes
345345
btc: Yes
346346
othercrypto: No
347-
doc: https://twitter.com/PasteCoin/status/943562876513673216
348347

349348
- name: piixPay
350349
url: https://piixpay.com

_data/developer.yml

-7
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@ websites:
9090
twitter: Cedexis
9191
facebook: Cedexis
9292

93-
- name: Cloud9
94-
url: https://c9.io
95-
img: cloud9.png
96-
bch: No
97-
twitter: cloud9ide
98-
facebook: Cloud9IDE
99-
10093
- name: CM Telecom
10194
url: https://www.cm.com/
10295
img: cmtelecom.png

_data/donation-non-profit.yml

+12
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ websites:
77
btc: Yes
88
othercrypto: Yes
99
doc: https://www.antiwar.com/cryptocurrencies/
10+
11+
- name: Coins 4 Clothes
12+
url: https://www.coins4clothes.com
13+
img: coins4clothes.png
14+
twitter: coins4clothes
15+
facebook: coins4clothes
16+
region: na
17+
country: CA
18+
city: Toronto
19+
bch: Yes
20+
btc: No
21+
othercrypto: No
1022

1123
- name: Growing Veterans
1224
url: https://growingveterans.org/

_data/entertainment.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ websites:
191191
img: rockstuff.png
192192
facebook: RockStuffCheck12
193193
email_address: [email protected]
194-
bch: No
195-
btc: No
194+
bch: Yes
195+
btc: Yes
196196
othercrypto: No
197197

198198
- name: Roku
@@ -287,13 +287,6 @@ websites:
287287
twitter: Twitch
288288
facebook: Twitch
289289

290-
- name: Vidme
291-
url: https://vid.me/
292-
img: vidme.png
293-
bch: No
294-
twitter: vidme
295-
facebook: vidme
296-
297290
- name: Vimeo
298291
url: https://vimeo.com/
299292
img: vimeo.png

_data/other.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ websites:
245245
url: https://pastebin.com
246246
img: pastebin.png
247247
bch: No
248+
btc: Yes
248249
twitter: pastebin
249250
facebook: pastebin
250251
email_address: [email protected]
@@ -256,17 +257,6 @@ websites:
256257
twitter: patreon
257258
facebook: patreon
258259

259-
- name: PekTech
260-
url: https://pek.tech
261-
img: pektech.png
262-
twitter: pek_tech
263-
email_address: [email protected]
264-
region: na
265-
bch: Yes
266-
btc: No
267-
othercrypto: Yes
268-
doc: https://twitter.com/pek_tech/status/962967524605231104
269-
270260
- name: PhraseApp
271261
url: https://phraseapp.com
272262
img: phraseapp.png

_data/retail.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ websites:
4040
- name: Adafruit
4141
url: https://www.adafruit.com
4242
img: adafruit.png
43-
bch: No
43+
bch: Yes
44+
btc: Yes
4445
twitter: adafruit
4546
facebook: adafruitindustries
46-
email_address:
47+
exceptions:
48+
text: "To use any cryptocurrency, the order must exceed $100 before the option becomes available during checkout."
4749

4850
- name: AdoramaPix
4951
url: http://www.adoramapix.com
@@ -416,7 +418,8 @@ websites:
416418
- name: FastTech
417419
url: https://www.fasttech.com
418420
img: fasttech.png
419-
bch: No
421+
bch: Yes
422+
btc: Yes
420423
facebook: fasttech.net
421424

422425
- name: Flipkart
@@ -594,7 +597,7 @@ websites:
594597
btc: yes
595598
othercrypto: yes
596599
exceptions:
597-
text: "Currently accepting BCH if you request an address. Working on adding BCH to the payment flow."
600+
text: "Currently accepting BCH if you request an address. Working on adding BCH to the payment flow."
598601

599602
- name: King Pen Vapes
600603
url: https://kingpenvapes.com/

_data/security.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,15 @@ websites:
325325
img: torguard.png
326326
bch: No
327327
btc: Yes
328+
othercrypto: Yes
328329
twitter: TorGuard
329330
facebook: TorGuard
330331

331332
- name: TunnelBear
332333
url: https://tunnelbear.com/
333334
img: tunnelbear.png
334-
bch: No
335+
bch: Yes
336+
btc: Yes
335337
twitter: theTunnelBear
336338
facebook: tunnelbear
337339

@@ -340,7 +342,9 @@ websites:
340342
img: vpnunlimited.png
341343
twitter: vpnunlimited
342344
facebook: vpnunlimitedapp
343-
bch: No
345+
bch: Yes
346+
btc: Yes
347+
othercrypto: No
344348

345349
- name: vpn.ac
346350
url: https://vpn.ac/
@@ -352,6 +356,8 @@ websites:
352356
- name: Windscribe
353357
url: https://windscribe.com
354358
img: windscribe.png
355-
bch: No
359+
bch: Yes
360+
btc: Yes
361+
othercrypto: Yes
356362
twitter: windscribecom
357363
facebook: windscribe

_data/social.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,11 @@ websites:
176176
- name: Reddit
177177
url: https://www.reddit.com/
178178
img: reddit.png
179-
bch: No
180-
btc: Yes
181179
twitter: reddit
180+
bch: No
181+
btc: No
182+
exceptions:
183+
text: "On March 23rd, 2018 Reddit disabled BTC payments for buying Reddit Gold."
182184

183185
- name: Snapchat
184186
url: https://www.snapchat.com/

img/developer/cloud9.png

-1.2 KB
Binary file not shown.
498 Bytes
Loading

img/entertainment/vidme.png

-777 Bytes
Binary file not shown.

img/other/pektech.png

-1.13 KB
Binary file not shown.

0 commit comments

Comments
 (0)