Commit graph

1146 commits

Author SHA1 Message Date
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
qertoip
bea8d35921 Fix broken link to the guide on downloads page 2017-08-31 11:34:22 +02:00
qertoip
fac871a6a1 Enhance Moneropedia ring signatures entry 2017-08-31 11:33:10 +02:00
qertoip
4868efb668 Add technical specs page 2017-08-31 11:32:20 +02:00
Riccardo Spagni
3eae808620 Merge pull request #367 from QuickBASIC/issue-kludge
Add Github Housekeeping Section to README.md
2017-08-31 11:25:09 +02:00
Riccardo Spagni
b5d5c56063 Merge pull request #363 from qertoip/bundler
Make the setup easier and more repeatable by using Bundler
2017-08-31 11:24:08 +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
Riccardo Spagni
1836a3a7b0 Merge pull request #359 from tyrionmcmaster/patch-2
Update Home Page
2017-08-31 11:21:25 +02:00
Riccardo Spagni
15b92ec4dc Merge pull request #353 from KeeJef/master
Importing the Blockchain users guide
2017-08-31 11:20:01 +02:00
Riccardo Spagni
872fba650f Merge pull request #351 from timotgl/master
Fix typo in "your hashrate"
2017-08-31 11:19:24 +02:00
Riccardo Spagni
c2267e718f Merge pull request #350 from tyrionmcmaster/patch-1
Update "What is Monero" page
2017-08-31 11:19:08 +02:00
Riccardo Spagni
4da0365423 Merge pull request #348 from cryptochangements34/master
Add user guide for connecting to a remote node within the GUI
2017-08-31 11:18:52 +02:00
Riccardo Spagni
d7c6fc2654 Merge pull request #332 from SamsungGalaxyPlayer/master
Add GUI solo mining guide
2017-08-31 11:18:18 +02:00
Riccardo Spagni
e7387e39a1 Merge pull request #320 from erciccione/merch
Updates merchants list
2017-08-31 11:16:47 +02:00
Riccardo Spagni
4a33be9f33 Merge pull request #282 from anonimal/VRP
Repo: add Vulnerability Response Process
2017-08-31 11:14:47 +02:00
cryptobadger
255e776840
Added missing result and outputs for sweep_all 2017-08-30 01:30:27 +02:00
cryptobadger
1f5d2c4fb1
Further reformatting 2017-08-30 01:21:28 +02:00
cryptobadger
eb581dda52
Added missing wallet-rpc calls, minor reformatting 2017-08-30 01:12:42 +02:00
Mike Justman
0708d46b9e Update node.md
* clarified text
2017-08-29 14:52:36 -04:00
Mike Justman
819731fa6c Update cryptocurrency.md
* expand stub
2017-08-29 13:58:32 -04:00
Mike Justman
3aa7168134 Update change.md 2017-08-29 13:06:38 -04:00
Mike Justman
d2112e486d Update node.md 2017-08-29 13:04:29 -04:00
Mike Justman
3d8b1f9fa9 Expand "Node" article on Moneropedia
My assumption is that people visiting the Monero site to find out what a node is are going to be less knowledgeable about cryptocurrency as a whole, so this is written to that audience. We can definitely expand articles and add depth later.
2017-08-29 12:46:22 -04: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
Mike Justman
abff937705 create missing dev meeting post for posterity
closes #111
2017-08-29 09:52:54 -04:00
Mike Justman
322f81cf95 Updated key image text.
* updated key image text.
2017-08-28 19:39:10 -04:00
Mike Justman
cf80254412 Update index.md
* grammar: repeated word (the the)
* consolidated paragraph for clarity (slight re-write)
2017-08-28 15:24:15 -04:00
Mike Justman
d6e7fda47e Update index.md
* clarification
2017-08-28 14:56:38 -04:00
Mike Justman
89099b411f Update index.md
### Update FAQ
* added key image information (double spend protection)
* clarified Pedersen commitment information
2017-08-28 14:52:38 -04:00
Riccardo Spagni
b6f0dff227
update text blocks in disclosure post 2017-08-28 19:38:31 +02:00
Riccardo Spagni
ff3c982baa
update CN bug blog post, add commitment texts 2017-08-28 19:28:26 +02:00
Mike Justman
0bbeb816be Add Pedersen Commitment Moneropedia Entry
Text modified from [this](https://www.reddit.com/r/Monero/comments/6wi512/how_can_a_third_party_verify_my_transaction/dm89e8g/) Reddit comment from @knaccc.
2017-08-28 13:00:47 -04:00
Mike Justman
0071ea3a69 Add Pedersen Commitments explanation to FAQ
Text from [here](https://www.reddit.com/r/Monero/comments/6wi512/how_can_a_third_party_verify_my_transaction/dm89e8g/).
2017-08-28 12:29:54 -04:00
Uninteresting Account
fcd120eded Spelling: anotated -> annotated 2017-08-27 17:36:24 +10: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
Mike
d55e083a62 Add Github Housekeeping Section to README.md
The following Issues are either already fixed by the site redesign, fixed by a pull request by a contributor, or have comments from @rerhar requesting closure:
closes #1
closes #5
closes #17
closes #49
closes #56
closes #62
closes #101
closes #109
closes #111
closes #142
closes #180
closes #181
closes #195
closes #199
closes #214
closes #221
2017-08-25 14:52:04 -04:00
tyrionmcmaster
3cb118d363 Update index.html 2017-08-24 23:50:52 -04:00
qertoip
a9c82a0354 Remove inactive merchants (websites long down) 2017-08-24 23:28:48 +02:00
qertoip
fe107793f1 Make the setup easier and more repeatable by using Bundler 2017-08-24 23:27:10 +02:00
tyrionmcmaster
602e4c29e1 Update index.html
Thank you everyone for your input. Please let me know if this is an improvement.
2017-08-23 12:14:55 -04:00
tyrionmcmaster
9a6d99e7b6 Update Home Page
Please review and comment.
2017-08-22 14:25:14 -04:00
tyrionmcmaster
5d422aac6d Update index.md 2017-08-22 13:54:08 -04:00
tyrionmcmaster
7ecdc0d53f Update index.md 2017-08-22 13:53:44 -04:00
erciccione
788099f11e updates merchants list 2017-08-22 14:19:11 +02:00
KeeJef
97cdd41660 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	resources/user-guides/index.md
2017-08-21 21:54:10 +10:00