Commit graph

3028 commits

Author SHA1 Message Date
Riccardo Spagni
b8edf5babc
fix conflicts 2016-08-14 19:39:49 +02:00
Riccardo Spagni
c711fb987f
fix broken menu 2016-08-14 19:19:50 +02:00
Riccardo Spagni
997ff4ec6c Merge pull request #129 from stefioan/patch-2
Duplicate entry on merchants.
2016-08-10 14:01:19 +02:00
Riccardo Spagni
72df1c4f54 Merge pull request #135 from dEBRUYNE-1/master
Add logs for the last two dev and Kovri meetings
2016-08-10 14:00:57 +02:00
Riccardo Spagni
0c18bda16b Merge pull request #134 from coolcodecrypto/patch-5
Update header.html
2016-08-10 14:00:52 +02:00
Riccardo Spagni
3d620dd27d Merge pull request #133 from coolcodecrypto/patch-4
Update merchants.yml
2016-08-10 14:00:47 +02:00
Riccardo Spagni
66b021d934 Merge pull request #132 from coolcodecrypto/patch-3
Update merchants.yml
2016-08-10 14:00:42 +02:00
dEBRUYNE-1
e8a7ae0c97
Add logs for the last two dev and Kovri meetings 2016-08-08 20:05:57 +02:00
coolcodecrypto
4f4e985ee1 Update header.html 2016-08-08 04:01:17 +00:00
coolcodecrypto
86ee37209c Update header.html
added stack exchange to community menu
2016-08-08 03:46:40 +00:00
coolcodecrypto
e4426724ca Update merchants.yml
added 2 explorers and 1 exchange listing
2016-08-08 03:29:52 +00:00
coolcodecrypto
1738ed9e96 Update merchants.yml
First farm to accept Monero!
https://www.reddit.com/r/Monero/comments/4wbh0t/the_tsunami_is_coming/d6689ht
2016-08-07 04:00:11 +00:00
coolcodecrypto
519dce0c43 Update merchants.yml
Added Infield loan services. Source was PM following this post:
https://redd.it/4wfu0o
2016-08-06 22:08:59 +00:00
coolcodecrypto
34dff10458 Update merchants.yml
removed duplicate web developer listing
2016-08-06 13:27:40 +00:00
coolcodecrypto
a2cead4947 Update merchants.yml
source for merchant addition: https://www.reddit.com/r/Monero/comments/4wbh0t/the_tsunami_is_coming/d6639g2
2016-08-06 13:06:22 +00:00
cAP5L0CK
2140128975 Changes to Donators 2016-07-25 08:37:37 -05:00
Stefanos Ioannou
182d3f6133 Duplicate entry.
Duplicate entry of "Web Developer - Stefanos".
2016-07-20 10:10:19 +03:00
Riccardo Spagni
018fb0c977 Merge pull request #128 from coolcodecrypto/patch-2
California Fintech Network now accepts Monero payments
2016-07-19 21:11:18 +02:00
Riccardo Spagni
e36aaa0b1b Merge pull request #127 from palexande/master
Update monero_tools.md
2016-07-19 21:11:13 +02:00
coolcodecrypto
da7f3f3952 California Fintech Network now accepts Monero payments
https://twitter.com/cafintechnet/status/751234501993312256
2016-07-09 12:39:48 +00:00
Patrick Alexander
050b751d42 Update monero_tools.md
Update link
2016-07-07 02:45:21 -06:00
Riccardo Spagni
3cf1ea765a Merge pull request #126 from Gingeropolous/master
Forum link. Update 2016-06-20-monero-missive-for-the-week-of-2016-06-20.md
2016-06-29 13:43:29 +02:00
Gingeropolous
a838418e06 Update 2016-06-20-monero-missive-for-the-week-of-2016-06-20.md 2016-06-25 13:17:48 -04:00
Riccardo Spagni
b4837d4661
fix logs 2016-06-25 19:04:02 +02:00
Riccardo Spagni
b5e537ce36
clean up missive post 2016-06-25 18:52:45 +02:00
Riccardo Spagni
c79cf5d812 Merge pull request #125 from dEBRUYNE-1/master
Add logs for Kovri and dev meeting
2016-06-25 18:49:34 +02:00
dEBRUYNE-1
5a49bbee10
Merge branch 'master' of https://github.com/dEBRUYNE-1/monero-site 2016-06-20 21:10:29 +02:00
dEBRUYNE-1
4c4942225b
Add logs for Kovri and dev meeting 2016-06-20 21:08:46 +02:00
Riccardo Spagni
ba83b9a53c
very minor tweaks to the blog post 2016-06-19 17:30:24 +02:00
Riccardo Spagni
7efb016048 Merge pull request #124 from Gingeropolous/master
post for new monero missive 20160620
2016-06-19 10:01:19 +02:00
Gingeropolous
bf8dec5487 post for new monero missive 20160620 2016-06-17 06:53:55 -04:00
Riccardo Spagni
7fc6aee85b
log tweaks 2016-06-06 15:43:40 +02:00
Riccardo Spagni
d27bbd853d Merge branch 'coolcodecrypto-patch-1' 2016-06-06 15:33:22 +02:00
Riccardo Spagni
2f95c926b1
fixed conflict in merchants.yml 2016-06-06 15:33:09 +02:00
Riccardo Spagni
4b321f0766 Merge pull request #123 from dEBRUYNE-1/master
Add logs for 8th dev meeting and Kovri meeting
2016-06-06 15:29:03 +02:00
dEBRUYNE-1
f1363d522f Update 2016-06-05-overview-and-logs-for-the-dev-meeting-held-on-2016-06-05.md 2016-06-05 23:39:48 +02:00
dEBRUYNE-1
16293753ce
Add logs for 8th dev meeting and Kovri meeting 2016-06-05 22:57:07 +02:00
Riccardo Spagni
e5dd752d94 Merge pull request #121 from dEBRUYNE-1/master
Add Bitsquare to exchanges
2016-06-05 22:10:59 +02:00
Riccardo Spagni
026d803942 Merge pull request #120 from stefioan/patch-1
Addition of Web Developer to Merchants
2016-06-05 22:10:47 +02:00
coolcodecrypto
2aaf768efc Update merchants.yml
combine pull request #120 and #121 with cryptostorm listing. Listings added alphabetically
2016-06-02 18:46:03 +00:00
dEBRUYNE-1
bc47549455
Add Bitsquare to merchants 2016-05-25 12:58:35 +02:00
Stefanos Ioannou
dce075db19 Addition of Web Developer to Merchants 2016-05-25 11:40:11 +03:00
Riccardo Spagni
a39178e25f
fixed logs 2016-05-22 21:52:45 +02:00
Riccardo Spagni
e9b50bb2a2 Merge pull request #118 from dEBRUYNE-1/master
Add logs for 7th dev meeting and Kovri meeting
2016-05-22 21:40:16 +02:00
dEBRUYNE-1
058925274a
Add logs for 7th dev meeting and Kovri meeting 2016-05-22 21:35:14 +02:00
Riccardo Spagni
0293708a09
fixed Kaja's URL 2016-05-22 17:35:26 +02:00
Riccardo Spagni
cd4976b532 Merge pull request #117 from antanst/master
Small changes in Moneropedia -> Payment ID
2016-05-22 17:33:20 +02:00
Riccardo Spagni
8e5e685f44 Merge pull request #116 from PsychicCat/master
change transaction to payment ID
2016-05-22 17:33:12 +02:00
Riccardo Spagni
53d3a610fb Merge pull request #115 from coolcodecrypto/patch-1
Update merchants.yml
2016-05-22 17:32:44 +02:00
antanst
d8db0fc7e8 Merge branch 'master' of ssh://github.com/monero-project/monero-site 2016-05-22 14:28:53 +03:00