Commit graph

422 commits

Author SHA1 Message Date
luigi1111
d5586d1373
Merge pull request #560 from mattcode55/559-renjer
Add Renjer Snacks to merchants list
2018-01-19 04:53:46 -05:00
luigi1111
b02eb27a01
Merge pull request #546 from mattcode55/walletmonero-tracking
Remove Google Analytics tracking parameters from merchants
2018-01-19 04:52:36 -05:00
erciccione
1e54be6063
add merchant whattheserver 2018-01-18 13:32:35 +01:00
erciccione
f669e19699
add merchant hodlmonkey 2018-01-18 13:29:45 +01:00
Matt Smith
24806f8700 Add DeepWebVPN to merchants list 2018-01-17 14:57:03 +00:00
Matt Smith
511f4a2003 Add Renjer Snacks to merchants list 2018-01-17 13:51:50 +00:00
mattcode55
884c17d6de Remove Google Analytics tracking parameters from merchants 2018-01-10 19:32:08 +00:00
luigi1111
a1789094d8
Merge pull request #545 from mattcode55/544-inst-us
Add INST.US to merchants.yml
2018-01-10 12:26:46 -05:00
luigi1111
03f3fcdac9
Merge pull request #542 from mattcode55/541-ablative-hosting
Add ablative.hosting to merchants list
2018-01-10 12:26:20 -05:00
Matt Smith
db260b4af9 Add INST.US to merchants.yml 2018-01-10 13:41:34 +00:00
Matt Smith
cbc7145124 Add TorGuard to merchants list 2018-01-09 11:03:44 +00:00
Matt Smith
da6bdf309c Add ablative.hosting to merchants list 2018-01-08 14:39:26 +00:00
erciccione
ec8532b569
add merchant #533 2017-12-30 15:04:15 +01:00
erciccione
e704479bd5
add merchant IdeaSoft 2017-12-29 13:46:22 +01:00
erciccione
90e5099351
add abaco hosting to merchants 2017-12-29 13:46:22 +01:00
erciccione
4d26e54bd5
add merchant Revolution Microelectronics 2017-12-29 13:46:19 +01:00
alvinjoelsantos
38fa278e9a
Added Reservoir Mugs to Merchants 2017-12-24 02:32:47 +03:00
Eric Szeto
b3781f45ee Add new goods merchant
Project Coral Reef is a listing of new stores accepting Monero as a form of payment
2017-12-18 16:06:55 -08:00
luigi1111
5774c3edae
Merge pull request #517 from erciccione/merch
Add Congrevape to merchants list
2017-12-17 12:19:32 -06:00
Matt Smith
b242d82858 Add BunkerVPN to merchants
Fix #519
2017-12-16 18:43:41 +00:00
erciccione
6f3796ee0a
add congrevape to merchants list 2017-12-15 13:50:36 +01:00
luigi1111
f35fcf1ca1
Merge pull request #510 from erciccione/merch
Add cryptolotto to merchants list
2017-12-13 13:14:23 -06:00
erciccione
a1da289e11
add cryptolotto to merchants list 2017-12-13 14:17:19 +01:00
luigi1111
ff294b821e
Merge pull request #504 from mattcode55/merchant-crypto-armory
Add Crypto Armory merchant
2017-12-11 11:09:23 -06:00
luigi1111
d7e3f93aa0
Merge pull request #493 from QuickBASIC/patch-1
Add Merchants
2017-12-11 11:07:46 -06:00
Matt Smith
8ca06eaa1f Add Crypto Armory merchant 2017-12-09 08:56:52 +00:00
Mike Justman
0e1e66404b Add merchants 2017-12-08 22:47:00 -05:00
luigi1111
85fd87b8b0
Merge pull request #490 from mattcode55/fix-466
Add MegaChange.is exchange
2017-12-08 15:52:21 -06:00
luigi1111
46ae94483f
Merge pull request #500 from MaxXor/fix-tags
Update blog post tags
2017-12-08 15:51:17 -06:00
erciccione
bc8a987cbb
add merchant 'hammock universe' 2017-12-08 12:29:09 +01:00
MaxXor
aaa32b7f33 Update blog post tags 2017-12-08 09:39:02 +01:00
erciccione
8b80fa5f31
add merchant ink-rebels 2017-12-07 14:37:16 +01:00
luigi1111
7d474a0529
Merge pull request #482 from mattcode55/fix-481
Add secpoint.com to merchants.yml
2017-12-04 09:56:29 -06:00
luigi1111
802e2213ac
Merge pull request #489 from mattcode55/fix-488
Add 99Stack.com
2017-12-04 09:54:39 -06:00
luigi1111
c89edcef45
Merge pull request #464 from erciccione/merch
Add merchants to list
2017-12-04 09:52:25 -06:00
Matt Smith
de68b0918f Add MegaChange.is exchange
Fix #466
2017-12-01 10:30:49 +00:00
Matt Smith
3c0c07f8db Add 99Stack.com
Fix #488
2017-11-22 16:16:06 +00:00
erciccione
e4943af6b6
add merchant go forward software 2017-11-21 02:51:50 +01:00
erciccione
c6bc175334
add merchant changenow 2017-11-20 04:10:21 +01:00
Matt Smith
d38404bd0f Add secpoint.com to merchants.yml
Fix #481
2017-11-18 20:38:47 +00:00
Matt Smith
cf65da2f4b irc: add #monero-hardware
Fix 474
2017-11-11 10:09:09 +00:00
erciccione
bd39262dc9
add monerowallet 2017-11-09 19:56:12 +01:00
erciccione
fe34c85cf9
add merchant gameofcryptos 2017-11-09 19:30:12 +01:00
erciccione
ca18088a85
add merchants to list 2017-11-09 19:30:12 +01:00
Steve Divskinsy
9ceecd1386
Added in Tuxcon web + mail hosting
Tuxcon accepts Monero as payment for web and mail hosting services
2017-11-02 13:53:24 +10:30
rehrar
c083124340
- Added completed proposals
- Added dates to the layout
- Slight modifications to the layouts (bolding author, etc.)
2017-10-30 20:28:17 -06:00
Riccardo Spagni
35857ace1f
update Mac hashes 2017-10-27 12:31:24 +02:00
Riccardo Spagni
db0b8209a1 Merge branch 'master' of https://github.com/monero-project/monero-site 2017-10-26 23:03:27 +02:00
Riccardo Spagni
dfaad4cd57
update hashes and downloads for GUI 2017-10-26 23:03:01 +02:00
Matt Smith
60d125e891 Add marcosaguayo.com to merchants.yml
Fix #451
2017-10-25 18:48:25 +01:00
luigi1111
4b047ce538 Merge pull request #446 from MaxXor/downloads-fix
Fix blockchain bootstrap url and duplicate bsd id
2017-10-25 12:35:51 -05:00
luigi1111
d30e14829e Merge pull request #450 from mattcode55/fix-449
Add KoDDoS.net to merchants.yml
2017-10-25 12:34:39 -05:00
MaxXor
4b30f72838 Fix link to source code on downloads page 2017-10-25 18:58:25 +02:00
Riccardo Spagni
da842365a3
update hashes for armv7 and armv8 builds 2017-10-25 16:37:17 +02:00
Riccardo Spagni
2b08c0abf3
update v0.11.1 links 2017-10-24 22:36:10 +02:00
Matt Smith
768f6ce162 Add KoDDoS.net to merchants.yml 2017-10-21 15:29:19 +01:00
MaxXor
3383b1b0f6 Fix blockchain bootstrap url and duplicate bsd id 2017-10-17 13:15:00 +02:00
rehrar
f5464b2315
- Updated README with a few more instructions
- Updated events
- Added Mattermost and Taiga to Hangouts page and fixed Reddit icon
- Added icons to Team page to replace links
- Added DragonflyBSD icon to spritesheet and placed on Downloads page
- Added Monero Press Kit page and several PNG and AI files, including a large zip with everything
- Updated Website General User Guide
- Changed Surae's name to Brandon on MRL page
- Several CSS tweaks and fixes
2017-10-15 15:39:52 -06:00
rehrar
7daf9dc6ff
- Removed some IRC channels from Hangouts page (not every temporary one needs to be added)
- Readded Blog RSS Feed to the footer
- Added Mattermost and Taiga to the Hangouts page
- Added Press Kit page
- CSS Tweaks
2017-10-15 15:37:25 -06:00
rehrar
5827b461ec
- Updated events page
- Updated merchants page to include ids
- Updated roadmap
- CSS tweaks and fixes
- Fixed FAQ bug in last question
- Added preliminary press kit page
2017-10-15 15:37:25 -06:00
Riccardo Spagni
4a0f93cd62
fix merchants.yml 2017-10-15 22:06:23 +02:00
Riccardo Spagni
3babb9f198 Merge pull request #439 from mattcode55/fix-438
Add AirVPN.org to merchants.yml
2017-10-15 22:04:54 +02:00
Riccardo Spagni
a6e39c9c33 Merge pull request #432 from mattcode55/fix-431
Add karsha.biz to merchants.yml
2017-10-15 22:03:06 +02:00
Riccardo Spagni
6cd7f873c3 Merge pull request #430 from erciccione/merch
Add xusah.boutique to merchants list + rearrange in alphabetic order
2017-10-15 22:02:58 +02:00
Riccardo Spagni
a8dc1a821b Merge pull request #428 from slayerulan/patch-1
Add evercoin to merchants.yml
2017-10-15 22:02:39 +02:00
Riccardo Spagni
5968b71797 Merge pull request #427 from apezio/patch-1
Update merchants.yml
2017-10-15 22:02:18 +02:00
Riccardo Spagni
c838acb081 Merge pull request #425 from alvinjoelsantos/master
Added Atesti to Tools
2017-10-15 22:02:10 +02:00
Riccardo Spagni
9fcac23780 Merge pull request #424 from parasew/patch-1
added link to go (golang) libraries and utilities
2017-10-15 22:02:00 +02:00
Matt Smith
caadcc431d Add AirVPN.org to merchants.yml
Fix #438
2017-10-10 09:28:33 +01:00
erciccione
c0b673b354
rearrange category 'goods' in alphabetic order 2017-10-09 19:32:01 +02:00
Matt Smith
9e25b88e94 Add karsha.biz to merchants.yml
Fix #431
2017-10-09 07:56:27 +01:00
erciccione
9e6a141d78
add xusah.boutique to merchants list 2017-10-07 16:30:35 +02:00
slayerulan
7ac807df89 Add evercoin to merchants.yml 2017-10-04 19:44:16 +03:00
apezio
64d31d4f8b Update merchants.yml 2017-10-03 16:56:06 -07:00
alvinjoelsantos
f461137aaa
Put in alphabetical order 2017-10-03 02:46:49 -05:00
alvinjoelsantos
c0feba5032
Added Atesti to Tools 2017-09-30 17:10:03 -05:00
Matthias Tarasiewicz
943151cc04 Update merchants.yml
changed golang url to point to specific github page
2017-09-29 16:34:10 +02:00
Matthias Tarasiewicz
55e25cfcb8 added link to go (golang) libraries and utilities 2017-09-27 12:37:08 +02:00
MaxXor
5fce854ede Update roadmap 2017-09-25 20:22:51 +02:00
Riccardo Spagni
b98ad54b12
fix roadmap 2017-09-25 20:04:47 +02:00
Riccardo Spagni
f037bb4c6d Merge pull request #415 from MaxXor/tags-fix
Add missing protocol upgrade tag
2017-09-25 10:57:05 -07:00
Riccardo Spagni
5052c63c8e Merge pull request #412 from erciccione/add-merch
Add Localmonero to Merchant list
2017-09-25 10:56:45 -07:00
Riccardo Spagni
e1f791a19e Merge pull request #407 from mattcode55/fix-406-thebigcoinio
Add thebigcoin.io to merchants.yml
2017-09-25 10:56:35 -07:00
Riccardo Spagni
431caa2a15 Merge pull request #329 from SamsungGalaxyPlayer/patch-9
Update roadmap.yml
2017-09-25 10:55:32 -07:00
SamsungGalaxyPlayer
8f692614b3 Update roadmap.yml 2017-09-25 12:53:49 -05:00
Riccardo Spagni
3d03ae6da1
expand team URLs to include github, reddit, etc., add devs 2017-09-24 20:33:00 +02:00
erciccione
9a4a2b72df
add localmonero to merchant list 2017-09-24 17:47:01 +01:00
MaxXor
9e051479c4 Add missing protocol upgrade tag 2017-09-23 13:21:07 +02:00
Matt Smith
7611614c9d Add thebigcoin.io to merchants.yml
Fix #406
2017-09-21 18:09:50 +01:00
Matt Smith
1ace2f5a52 Add allforcrypto.com to merchants.yml
Fix #403
2017-09-15 13:40:48 +01:00
Riccardo Spagni
4044711c55
update GUI hashes 2017-09-12 22:39:12 +02:00
Riccardo Spagni
67b9b2f5de
update downloads file with new hashes 2017-09-11 17:57:33 +02:00
Riccardo Spagni
d97c28af10
update 32-bit hasheas 2017-09-10 12:18:07 +02:00
Riccardo Spagni
ad3809c8b2 Merge pull request #369 from QuickBASIC/text-revisions-0
Minor spelling/grammar revisions
2017-09-09 08:34:27 -07:00
Riccardo Spagni
a54f472cfd
update downloads page 2017-09-09 17:32:24 +02:00
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
SamsungGalaxyPlayer
9e00c9cad1 Update roadmap.yml 2017-07-18 09:27:38 +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
Riccardo Spagni
e1c3647f98
Merge pull request #252
49a76c3 Update python package - pymonero to MoneroPy (Mike C)
2017-05-05 12:05:11 +02:00
Riccardo Spagni
b313b3c34e
Merge pull request #253
cc3a2f2 rm MoneroWorld explorer and add two others (Mike C)
2017-05-05 12:04:28 +02:00
Riccardo Spagni
66499e8181
Merge pull request #255
58696c2 Add Living Room of Satoshi to Merchants page (danielalexiuc)
2017-05-05 12:02:07 +02:00
alvinjoelsantos
b8f29f16a8
added new merchant 2017-04-25 16:12:17 +03:00