Commit graph

1243 commits

Author SHA1 Message Date
xmr-eric
09d0c5cdaa
Update copyright for 2018 2018-01-07 00:15:14 -05:00
luigi1111
0471a998b2
Merge pull request #530 from erciccione/merch
Add merchants to list
2018-01-06 20:32:49 -05:00
luigi1111
6f20c41207
Merge pull request #538 from mattcode55/536-fluffyblocks
Create Fluffy Blocks Moneropedia entry
2018-01-06 20:32:13 -05:00
Matt Smith
3b06d55275 Create Fluffy Blocks Moneropedia entry 2018-01-06 18:49:50 +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
luigi1111
b2e228b298
Merge pull request #531 from alvinjoelsantos/master
Added Reservoir Mugs to Merchants
2017-12-28 14:41:20 -05:00
alvinjoelsantos
38fa278e9a
Added Reservoir Mugs to Merchants 2017-12-24 02:32:47 +03:00
luigi1111
832c694414
Merge pull request #521 from mattcode55/ringct-video
Add RingCT video to carousel
2017-12-21 11:31:08 -06:00
luigi1111
b0a16cf726
Merge pull request #526 from mattcode55/jetbrains-logo
Update JetBrains logo
2017-12-21 11:30:53 -06:00
Matt Smith
04582555c4 Update JetBrains logo
And move JetBrains on sponsorship page
2017-12-20 18:48:23 +00:00
luigi1111
fa7cb8ca56
Merge pull request #437 from SamsungGalaxyPlayer/master
Add compressed RingCT video
2017-12-19 13:40:36 -06:00
luigi1111
daeea26bf8
Merge pull request #523 from krackydile/master
Add new goods merchant
2017-12-19 13:40:06 -06: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
Matt Smith
0e2882cac6 Add RingCT video to carousel 2017-12-18 15:08:04 +00:00
luigi1111
f85fb2124f
Merge pull request #502 from mattcode55/fix-miners
Update list of miners
2017-12-17 12:20:09 -06:00
luigi1111
5774c3edae
Merge pull request #517 from erciccione/merch
Add Congrevape to merchants list
2017-12-17 12:19:32 -06:00
luigi1111
4a5c23ff1e
Merge pull request #514 from MaxXor/add-tag
Add research tag to latest MRL meeting post
2017-12-17 12:17:04 -06:00
luigi1111
d7e849c444
Merge pull request #520 from mattcode55/fix-519
Add BunkerVPN to merchants
2017-12-17 12:16:52 -06:00
SamsungGalaxyPlayer
e79002a1fa Add RingCT video
Added compressed RingCT video
2017-12-16 14:16:06 -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
MaxXor
10bd443636 Add research tag to latest MRL meeting post 2017-12-14 09:41:52 +01:00
luigi1111
f35fcf1ca1
Merge pull request #510 from erciccione/merch
Add cryptolotto to merchants list
2017-12-13 13:14:23 -06:00
luigi1111
64dfb8f66a
Merge pull request #509 from dEBRUYNE-1/Fees2
Some fixes and adjustments for the "A note on fees" blogpost
2017-12-13 13:14:12 -06:00
luigi1111
17f7a0654f
Merge pull request #511 from patchandthat/blog-typo
Fix a typo in 'A note on fees' blogpost
2017-12-13 13:13:14 -06:00
luigi1111
6722b8328e
Merge pull request #512 from dEBRUYNE-1/master
Meeting Logs - Dev Meeting (2017-12-03), Community Meeting (2017-12-09), and Monero Research Lab Meeting (2017-12-11)
2017-12-13 13:13:05 -06:00
dEBRUYNE-1
4c059ae9ad
Meeting Logs - Dev Meeting (2017-12-03), Community Meeting (2017-12-09), and Monero Research Lab Meeting (2017-12-11) 2017-12-13 16:57:48 +01:00
Patrick Allwood
1ba406072e Fix a typo in 'A note on fees' blogpost
Corrected 'thhe' to 'the'
2017-12-13 14:47:41 +00:00
erciccione
a1da289e11
add cryptolotto to merchants list 2017-12-13 14:17:19 +01:00
dEBRUYNE-1
d206a29f55
Remove redundant parantheses and add Bitcoin Cash fees
Fix dynamic fee formula
2017-12-13 13:57:43 +01:00
luigi1111
54b24ec491
Merge pull request #506 from dEBRUYNE-1/Fees2
A note on fees blogpost
2017-12-11 15:35:07 -06:00
dEBRUYNE-1
0a801c7557
A note on fees
Fix tags

Remove redundant text

Fix current emission variable

Fix calculations
2017-12-11 21:45:50 +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
50de114969
Merge pull request #505 from MaxXor/fix-ignore
Remove unnecessary entries from .gitignore
2017-12-11 11:09:10 -06:00
luigi1111
6af963d239
Merge pull request #503 from MaxXor/fix-protocol-upgrade-tag
Fix missing protocol upgrade tag
2017-12-11 11:08:56 -06:00
luigi1111
d7e3f93aa0
Merge pull request #493 from QuickBASIC/patch-1
Add Merchants
2017-12-11 11:07:46 -06:00
MaxXor
0bf171c524 Remove unnecessary entries from .gitignore 2017-12-09 10:14:55 +01: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
MaxXor
2fec578f0b Fix missing protocol upgrade tag 2017-12-08 22:56:16 +01: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
luigi1111
05e7278a0f
Merge pull request #501 from erciccione/post-typo
Fix broken formatting of blog post (research lab meeting 2017-11-27)
2017-12-08 15:50:48 -06:00
luigi1111
8df5bd4c00
Merge pull request #498 from erciccione/merch
Add merchants to list
2017-12-08 15:50:36 -06:00
Matt Smith
d88e646a1b Update list of miners
- remove old miners
- replace xmr-stak-* with new, unified xmr-stak
- add xmrig
2017-12-08 18:19:53 +00:00
erciccione
2fecf9890e
fix broken formatting of blog post (research lab meeting 2017-11-27) 2017-12-08 12:42:37 +01:00
erciccione
bc8a987cbb
add merchant 'hammock universe' 2017-12-08 12:29:09 +01:00