Commit graph

226 commits

Author SHA1 Message Date
Mike Justman
c23db9b2c6 Merge branch 'master' into text-revisions-0 2017-09-09 11:32:21 -04:00
Mike Justman
33afcc55f0 Merge branch 'master' into patch-1 2017-09-09 11:28:33 -04:00
Riccardo Spagni
c50d4dbe3f Merge pull request #368 from ptsteadman/patch-1
Add Merchant: Computer Lab
2017-09-09 08:13:11 -07:00
Riccardo Spagni
a2416040c4 Merge pull request #364 from mattcode55/fix-360
Add NiceVPS.net
2017-09-09 08:12:52 -07:00
Riccardo Spagni
d3cdbbb629 Merge pull request #362 from qertoip/remove-inactive-exchanges-and-add-changelly
Remove inactive exchanges
2017-09-09 08:12:45 -07:00
Riccardo Spagni
a1c8b3c7c5 Merge pull request #310 from mattcode55/fix-294-dragonflybsd
Add DragonflyBSD download link
2017-09-09 08:11:40 -07:00
Riccardo Spagni
3bfa17e9b4 Merge pull request #385 from mattcode55/irc-channels
Cleanup IRC channels
2017-09-09 08:09:55 -07:00
Mike Justman
f31a075acd fix typo
- fix typo in safedice.com
2017-09-08 12:24:03 -04:00
Mike Justman
f021376787 Add XMRLotto.com
closes #390
2017-09-08 12:08:04 -04:00
Matt Smith
73c7f629d5 Add more channels to irc.yml
* Add #monero-translations
* Add #monero-website
2017-09-03 12:58:22 +01:00
Matt Smith
7e24e15c0e Add DragonflyBSD download link
* Fix #294
2017-09-02 21:07:21 +01:00
Matt Smith
7696a933bf Add more channels to irc.yml
* Add #monero-ffs
* Add #monero-offtopic
2017-09-02 20:49:31 +01:00
Matt Smith
4327f3dfda Create irc.yml
Create a data file for storing all IRC channels.
2017-09-02 20:36:21 +01:00
Matt Smith
8f7685dc36 Add Liberalcoins
Fix #382
2017-09-02 19:32:44 +01:00
Mike Justman
4bee793b10 add MSvB HW Design to Services
* add MSvB HW Design to Services closes #375
2017-08-31 11:57:52 -04:00
Mike Justman
ded62eb174 Update merchants.yml
* fixed https for xmr.to
* Changed Bitsquare to Bisq.io
2017-08-31 11:39:10 -04:00
Mike Justman
c96b8efd91 Merge branch 'master' into patch-1 2017-08-31 10:44:19 -04:00
Mike Justman
945934ddb6 clean up merchants.yml
- alphabetizes merchants in each category 
- removes Bit.AC ([company has been disolved](https://beta.companieshouse.gov.uk/company/09986257))
- adds [Monero Integrations](http://monerointegrations.com/)
- Moved Elise Hawkins Nutritional Therapy to Services (per comment in #259 already closed)
- closes #281 Globee is live (previously payb.ee) and at the URL https://globee.com instead of http://payb.ee.
- closes #360 (adds NiceVPS.net; @mattcode55; This PR is likely to break #364 so added here.)
- closes #228 (algostrategic.com added in #232 )
- closes #285 (synntechgaming.com added in #286 )
- closes #326 (SilverRound.com added in #328 )
2017-08-31 10:42:24 -04:00
Matt Smith
43500328f5 Add NiceVPS.net
Fix #360
2017-08-31 10:41:08 +01:00
qertoip
3442c35dfa Remove inactive exchanges 2017-08-31 11:35:51 +02:00
Riccardo Spagni
80d337b83f Merge pull request #361 from qertoip/remove-inactive-merchants
Remove inactive merchants (websites long down)
2017-08-31 11:22:08 +02:00
Mike Justman
ad84a4458c Update Payb.ee to GloBee
Globee is live (previously payb.ee) and at the URL https://globee.com instead of http://payb.ee.

closes #281
2017-08-29 10:12:54 -04:00
QuickBASIC
5d434aa4f7 minor spelling/grammar revisions
* grammar:
    * a/an
    * repeated words
    * fragmented sentences
    * possesion
    * run on sentences
    * commas for prepositional phrases
    * is/are conjugations
    * was/were
    * its/it's
    * capitalizing proper nouns (Monero, Bitcoin, etc)
    * formatting (removed linefeeds in middle of sentences)
    * can not/cannot
    * removed commas improperly before conjunctions
* spelling:
    * programmatically
    * hashrate
    * transferring
    * scalability
    * separate
    * transactions
    * additionally
    * particular
    * profitability
    * recommended
    * explicitly
    * separator
    * block
    * drawback
    * favorite
* spelling (br/us)
    * internationalization
    * specialized
    * analyze
    * centralized
    * decentalized
    * memorizing
    * synchronization
    * synchronized
2017-08-26 13:56:28 -04:00
Patrick Steadman
98280e3447 Add Merchant: Computer Lab 2017-08-25 22:08:12 -04:00
qertoip
a9c82a0354 Remove inactive merchants (websites long down) 2017-08-24 23:28:48 +02:00
erciccione
788099f11e updates merchants list 2017-08-22 14:19:11 +02:00
Riccardo Spagni
caaafac458 Merge pull request #337 from njalla/patch-1
Add Njalla
2017-08-18 09:49:03 +02:00
Riccardo Spagni
7c5d08db5a Merge pull request #331 from SamsungGalaxyPlayer/patch-11
Update merchants.yml
2017-08-18 09:46:06 +02:00
Riccardo Spagni
d760770be2 Merge pull request #330 from SamsungGalaxyPlayer/patch-10
Change my name
2017-08-18 09:45:59 +02:00
Riccardo Spagni
bae4d64b83 Merge pull request #328 from srcom-charles/master
Add SilverRound.com to merchants list.
2017-08-18 09:43:58 +02:00
serhack
102763d6dd Update merchants.yml 2017-08-15 09:35:06 +02:00
serhack
b7f8a747c4 Update merchants.yml 2017-07-29 14:00:12 +02:00
Njalla
67bbbe31de remove newline 2017-07-24 15:35:25 +02:00
Njalla
b63f98cc41 s/privacy aware/privacy-aware 2017-07-23 18:43:38 +02:00
njalla
ae8299ea9d Add Njalla 2017-07-22 17:15:53 +02:00
SamsungGalaxyPlayer
1e85912db0 Update merchants.yml 2017-07-18 09:42:55 +02:00
SamsungGalaxyPlayer
70f113eb22 Update team.yml 2017-07-18 09:31:13 +02:00
Charles Zink
d85c138b97 Add SilverRound.com to merchants list. 2017-07-17 10:37:30 -07:00
serhack
7ac2d7ffdb Update merchants.yml 2017-07-13 15:43:44 +02:00
Riccardo Spagni
6eef5a1eee Merge pull request #272 from pwrcycle/patch-1
Update merchants.yml
2017-07-07 18:11:15 +02:00
Riccardo Spagni
8af5f5d0ec Merge pull request #284 from erciccione/patch-2
fix broken links merchants.yml + what-is-monero
2017-07-07 18:06:01 +02:00
Riccardo Spagni
cf2a51107a Merge pull request #286 from QuickBASIC/patch-1
Update merchants.yml
2017-07-07 18:05:32 +02:00
erciccione
660e62e268
fix broken link 2017-07-05 17:05:12 +01:00
rehrar
4e41a6a0cf Added new site 2017-07-04 00:00:32 -06:00
rehrar
3c3d0698c9 Removed old site 2017-07-03 23:55:10 -06:00
QuickBASIC
5365dde577 Update merchants.yml
Shouldn't Crypto Kingdom be dropped from the directory? #283
Add Store to Merchant list #285
Two more exchangers #275
Please add Nutritional Therapy Services to Good and Services #259
2017-06-27 14:11:01 -04:00
erciccione
ce311c2331
updated merchants list and fixed broken links 2017-06-22 03:09:07 +01:00
pwrcycle
03dcf731ab Update merchants.yml 2017-06-02 09:30:12 -07:00
Riccardo Spagni
3944150e62
add GUI to downloads page, add sample nginx config file 2017-06-02 13:35:51 +02:00
RootBox-Kevin
7f74e8cdf5 Update merchants.yml 2017-05-05 13:59:13 -07:00