Commit graph

395 commits

Author SHA1 Message Date
Riccardo Spagni
41411bf385 Merge pull request #107 from PsychicCat/master
add Monero-PHP library to Merchants and Services list
2016-03-19 22:07:05 +02:00
Brendan Telzrow
20e489ab46 add Monero-PHP library to Merchants and Services list 2016-03-10 11:22:58 -06:00
Riccardo Spagni
9168bc6d5d
revert underscore fix, fix hanging asterixeseses 2016-03-05 20:37:30 +02:00
Riccardo Spagni
2ecdd0dbae
fixe underscores 2016-03-05 20:35:25 +02:00
Riccardo Spagni
2ed8cf5795
fixed dev meeting logs 2016-03-05 20:34:40 +02:00
Riccardo Spagni
135d391bb5
dev meeting 2016-03-05 logs 2016-03-05 20:33:25 +02:00
Riccardo Spagni
698a314438 Merge pull request #105 from Monero-Monitor/master
Add pymonero and Monero Monitor for Chrome
2016-03-05 20:15:17 +02:00
Mike C
bbbd3c8ca7 add Monero Monitor to tools
Monero Monitor is a Chrome extension for viewing information re: Monero.
2016-02-24 21:12:06 -05:00
Mike C
ae3c61671c add pymonero
pymonero is a new python package for interacting with bitmonerod and simplewallet
2016-02-24 21:09:09 -05:00
Riccardo Spagni
ce285cf69a
how do you even spell in Spanish 2016-02-18 23:40:08 +02:00
Riccardo Spagni
4555e5a9e0
home page spacing fix, thanks peter_bell 2016-02-18 16:22:33 +02:00
Riccardo Spagni
5935fc89e8
added gingeropolous' review 2016-02-17 18:33:32 +02:00
Riccardo Spagni
19ad6c44dd
added lightwallet java link 2016-02-17 18:29:27 +02:00
Riccardo Spagni
4c65417636
remove monerox, slight tweak to lightWallet text 2016-02-17 18:21:06 +02:00
Riccardo Spagni
403f95b49d Merge pull request #103 from jwinterm/master
Update links
2016-02-17 18:16:53 +02:00
jw
eda68e4443 Update links
Update links to new java version of lightwallet.
2016-02-16 19:02:12 -08:00
Riccardo Spagni
ac8adefd2a
2016-02-14 dev meeting logs 2016-02-16 16:07:21 +02:00
Patrick Alexander
8de776dd49
fixed merge conflict 2016-02-16 15:54:58 +02:00
Riccardo Spagni
1794bf1ff3 Merge pull request #102 from stefioan/deletion-cryptsy-exchanges
deletion of cryptsy from list of merchants
2016-02-16 15:53:11 +02:00
Stefanos Ioannou
c7c95b802f deletion of cryptsy from list of merchants 2016-02-13 22:46:58 +02:00
Riccardo Spagni
242bdf66e1
fixed date 2016-02-10 22:59:02 +02:00
Riccardo Spagni
04f056a61d
spacing 2016-02-10 16:31:01 +02:00
Riccardo Spagni
3f2370bd86
YIR forum link 2016-02-10 14:43:39 +02:00
Riccardo Spagni
6c52d7043d
kovri missive 2016-02-10 13:52:17 +02:00
Riccardo Spagni
8a467eafc4
dev meeting logs 2016-02-10 13:44:13 +02:00
Riccardo Spagni
8e677f66e8
centered images in YIR 2016-02-10 13:32:00 +02:00
Riccardo Spagni
f6e80031e4
fixed donators 2016-02-10 13:28:22 +02:00
Riccardo Spagni
ac4f06ef99 Merge branch 'master' of https://github.com/monero-project/monero-site 2016-02-10 13:12:17 +02:00
Riccardo Spagni
e52056d285
update donation addresses 2016-02-10 13:10:18 +02:00
Riccardo Spagni
b99c8b8ac3
2015 year in review, add blog assets, add kovri tag 2016-02-10 13:07:46 +02:00
Riccardo Spagni
6a4360f57b
updated Core Team 2016-02-10 12:21:23 +02:00
Riccardo Spagni
c298f5e231 Merge pull request #100 from cAP5L0CK/master
Updated Donators
2016-02-10 11:51:46 +02:00
cAP5L0CK
a9ddce7450 Update donators.yml 2016-02-04 13:36:52 -06:00
cAP5L0CK
8e275e57bc Updated Donators
Added recent donation including monerohouse ckg
2016-02-04 13:23:27 -06:00
Riccardo Spagni
c26d5c6388 Merge pull request #99 from stefioan/formatting-improvements-protocol_explanation.md
formatting-improvements-protocol_explanation.md
2016-02-04 16:31:32 +02:00
Riccardo Spagni
2be21fbec4 Merge pull request #98 from stefioan/crypto-kingdom-more-details
crypto-kingdom extra details
2016-02-04 16:31:25 +02:00
Stefanos Ioannou
ec6485d165 formatting-improvements-protocol_explanation.md 2016-02-01 21:54:51 +02:00
Stefanos Ioannou
e7c49a27ba crypto-kingdom extra details 2016-02-01 21:33:11 +02:00
Riccardo Spagni
68cf1167b1 Merge pull request #96 from monero-project/revert-95-multi-lang
Revert "Multi lang"
2016-01-30 17:42:51 +02:00
Riccardo Spagni
e5e14a28ca Revert "Multi lang" 2016-01-30 17:40:33 +02:00
Riccardo Spagni
71e32d576c Merge pull request #95 from mikemcdonald/multi-lang
Multi lang
2016-01-30 11:59:36 +02:00
Mike McDonald
7cbf030c15 merge upstream 2016-01-25 18:42:51 -06:00
Riccardo Spagni
9e8bbbcc01 Merge pull request #94 from stefioan/update-monerblocks-url
update monerblocks url to the new .info domain
2016-01-24 09:22:14 +02:00
Riccardo Spagni
bef15d1fdb Merge pull request #93 from stefioan/grammar/syntax-errors
correction of syntax and grammar errors
2016-01-24 09:22:10 +02:00
Riccardo Spagni
964b40ce77 Merge pull request #91 from stefioan/readme-copyright-notice
update README.md copyright notice
2016-01-24 09:22:06 +02:00
Riccardo Spagni
154a1103e4 Merge pull request #90 from stefioan/external-projects-linking
external projects linking
2016-01-24 09:22:01 +02:00
Stefanos Ioannou
7c687a4d98 update monerblocks url to the new .info domain 2016-01-23 22:05:54 +02:00
Stefanos Ioannou
1cb612d6fa correction of syntax and grammar errors 2016-01-23 21:32:17 +02:00
Stefanos Ioannou
f9e009c33f update README.md copyright notice 2016-01-23 12:52:47 +02:00
Stefanos Ioannou
ef964a34ca external projects linking 2016-01-23 12:47:45 +02:00