Commit graph

3619 commits

Author SHA1 Message Date
rehrar
b07fcb93c0 Merge pull request #4 from monero-project/master
Merge recent merges
2017-07-07 14:10:42 -06: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
Riccardo Spagni
8a783bd1cd Merge pull request #288 from dEBRUYNE-1/master
Logs for the Kovri and Dev meetings held on 2016-06-25
2017-07-07 18:05:19 +02:00
Riccardo Spagni
c6e9f1be1c Merge pull request #305 from jonathancross/forum-link
[urgent] Fix user-facing broken forum links
2017-07-07 18:04:34 +02:00
Riccardo Spagni
5c8f5456da Merge pull request #301 from jonathancross/remove-rocket
Removing broken link to rocket.xmrnation.com
2017-07-07 18:03:57 +02:00
Riccardo Spagni
0678b045b2 Merge pull request #300 from JollyMort/master
Fix wrong link to Stackexchange
2017-07-07 18:03:46 +02:00
Riccardo Spagni
6d07cfc1ba Merge pull request #299 from brnls/patch-1
Fix FAQ typo
2017-07-07 18:03:37 +02:00
rehrar
081f5d2471 FFS Finished
- Added Milestone capabilities
- Added and custom styled comments
2017-07-07 08:17:56 -06:00
Jonathan Cross
fae75edaf8
[urgent] Fix user-facing broken forum links 2017-07-07 03:02:15 +02:00
erciccione
b423d59cdb
fix missing link what-is-monero 2017-07-06 13:30:04 +01:00
Jonathan Cross
10f1dbb336
Removing broken link to rocket.xmrnation.com 2017-07-06 01:30:00 +02:00
JollyMort
101f949e35
Fix wrong link to Stackexchange 2017-07-05 21:42:21 +01:00
brnls
e03bc87860 Update index.md
typo fix
2017-07-05 09:29:02 -07:00
erciccione
660e62e268
fix broken link 2017-07-05 17:05:12 +01:00
Riccardo Spagni
50c8548319
Merge pull request #296
c57d24f Update index.md (SamsungGalaxyPlayer)
2017-07-05 11:45:10 +02:00
Riccardo Spagni
a06bd4dc26
Merge pull request #295
3d60112 fix a quick typo (sirneb)
2017-07-05 11:44:54 +02:00
Riccardo Spagni
a10f09cddc
Merge pull request #293
70255b6 Reverted FFS links (rehrar)
2017-07-05 11:44:33 +02:00
rehrar
7ab67bce26 Made correction to FFS revert
- Added https:// otherwise it wouldn't redirect properly.
2017-07-04 20:30:06 -06:00
SamsungGalaxyPlayer
c57d24fbd7 Update index.md 2017-07-04 21:11:03 +02:00
sirneb
3d60112667 fix a quick typo 2017-07-04 15:06:14 -04:00
rehrar
70255b6dcf Reverted FFS links
- Reverted link in Contributing to forum.getmonero.org
- Reverted header links to forum.getmonero.org
2017-07-04 10:30:10 -06:00
Riccardo Spagni
c80c882429 Merge pull request #292
79c3d97 Updated README (rehrar)
4e41a6a Added new site (rehrar)
3c3d069 Removed old site (rehrar)
2017-07-04 17:38:07 +02:00
rehrar
79c3d97133 Updated README
- Removed or restructured some old instructions
- Added instructions on how to edit various parts of the website
2017-07-04 09:18:49 -06: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
dEBRUYNE-1
b5c78801b9
Logs for the Community meeting held on 2017-07-02 2017-07-03 20:23:10 +02:00
dEBRUYNE-1
ba49462210
Logs for the Kovri and Dev meetings held on 2016-06-25 2017-06-28 18:01:59 +02: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
rehrar
9fd363d88f Merge pull request #3 from monero-project/master
Merge recent changes
2017-06-24 09:12:20 -06:00
Riccardo Spagni
9f3547b0d5
Merge pull request #277
ce311c2 updated merchants list and fixed broken links (erciccione)
2017-06-22 09:51:09 +02:00
Riccardo Spagni
42eefb2424
Merge pull request #274
84da839 Add link to GitHub from menu (Robby Weinberg)
2017-06-22 09:50:46 +02:00
Riccardo Spagni
00c623ed3d
Merge pull request #273
2ba634c updated RingCT obsolete description (erciccione)
2017-06-22 09:50:17 +02:00
Riccardo Spagni
bcb7122056
Merge pull request #271
5fa2761 Logs for the Kovri meetings held on 2017-06-04 + 2017-06-11 and logs for the Dev meeting held on 2017-06-11 (dEBRUYNE-1)
45ce311 Logs for the Dev meeting held on 2017-05-21 (dEBRUYNE-1)
2017-06-22 09:50:00 +02:00
Riccardo Spagni
74f03d3961
Merge pull request #266
bf3b95c automatic security (tokjingga)
2017-06-22 09:48:50 +02:00
Riccardo Spagni
4f4239afe2
Merge pull request #265
e91cfc6 Removing broken link to Rocket Chat rocket.xmrnation.com (Jonathan Cross)
2017-06-22 09:48:20 +02:00
erciccione
ce311c2331
updated merchants list and fixed broken links 2017-06-22 03:09:07 +01:00
dEBRUYNE-1
5fa2761446
Logs for the Kovri meetings held on 2017-06-04 + 2017-06-11 and logs for the Dev meeting held on 2017-06-11 2017-06-14 17:53:31 +02:00
Robby Weinberg
84da83946d Add link to GitHub from menu 2017-06-08 17:31:11 -05:00
erciccione
2ba634c61e updated RingCT obsolete description 2017-06-06 03:29:02 +01:00
Riccardo Spagni
c9ab990ea1
fix typo in linux 2017-06-03 22:58:07 +02:00
rehrar
265307a404 Merge pull request #2 from monero-project/master
Downloads section changes
2017-06-03 13:22:52 +03:00
pwrcycle
03dcf731ab Update merchants.yml 2017-06-02 09:30:12 -07:00
Riccardo Spagni
a6bbb5ebbb
add GUI to beta 2 note 2017-06-02 13:56:04 +02:00
Riccardo Spagni
8d91bbde0b
extra line spacing for wide screens 2017-06-02 13:54:54 +02:00
Riccardo Spagni
5c3bc97ebe
remove slugify on CLI+GUI platforms 2017-06-02 13:50:39 +02:00
Riccardo Spagni
6c843196f9
add blank platform icons where necessary 2017-06-02 13:47:05 +02:00
Riccardo Spagni
75ed47bc61
add spacing to downloads page 2017-06-02 13:38:16 +02:00
Riccardo Spagni
3944150e62
add GUI to downloads page, add sample nginx config file 2017-06-02 13:35:51 +02:00