1149 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Timo Taglieber	82c7b9a2e3	Fix typo in "your hashrate"	2017-08-19 12:06:28 +02:00
anonimal	cb5fdf21d9	Knowledge-base: create VRP page	2017-08-18 22:14:22 +00:00
anonimal	3c0375685c	Repo: add Vulnerability Response Process	2017-08-18 21:21:39 +00:00
cryptochangements	f9f796545f	fix merge conflicts	2017-08-18 15:13:47 -05:00
SamsungGalaxyPlayer	014c8561fd	Merge branch 'master' into master	2017-08-18 10:05:51 -05:00
Riccardo Spagni	ddaff002ad	Merge pull request #345 from mattcode55/fix-343-telegram ... Remove reference to Telegram	2017-08-18 09:50:36 +02:00
Riccardo Spagni	70bf0b90cc	Merge pull request #344 from jrob-io/patch-1 ... Use absolute units with background-position	2017-08-18 09:49:31 +02:00
Riccardo Spagni	b31a67982a	Merge pull request #340 from mattcode55/fix-106-tail-emission ... Create tail emission Moneropedia entry	2017-08-18 09:49:18 +02:00
Riccardo Spagni	739bfe01bd	Merge pull request #339 from mattcode55/community-addmrl ... Add #monero-research-lab to IRC channel list	2017-08-18 09:49:11 +02:00
Riccardo Spagni	caaafac458	Merge pull request #337 from njalla/patch-1 ... Add Njalla	2017-08-18 09:49:03 +02:00
Riccardo Spagni	be7a8cf3f4	Merge pull request #333 from SamsungGalaxyPlayer/patch-6 ... Update FAQ	2017-08-18 09:48:09 +02:00
Riccardo Spagni	7c5d08db5a	Merge pull request #331 from SamsungGalaxyPlayer/patch-11 ... Update merchants.yml	2017-08-18 09:46:06 +02:00
Riccardo Spagni	d760770be2	Merge pull request #330 from SamsungGalaxyPlayer/patch-10 ... Change my name	2017-08-18 09:45:59 +02:00
Riccardo Spagni	bae4d64b83	Merge pull request #328 from srcom-charles/master ... Add SilverRound.com to merchants list.	2017-08-18 09:43:58 +02:00
Riccardo Spagni	5bdd3758fb	Merge pull request #322 from anonimal/C4 ... Docs: add contributing guide and C4 with C4 addendum	2017-08-18 09:43:48 +02:00
Riccardo Spagni	60bb6531db	Merge pull request #321 from SamsungGalaxyPlayer/patch-7 ... Update smart mining	2017-08-18 09:43:39 +02:00
Riccardo Spagni	fb53c06ca9	Merge pull request #319 from shmacoshmuesday/master ... New User Guide - Restore from Keys	2017-08-18 09:43:32 +02:00
Riccardo Spagni	db96aa405c	Merge pull request #318 from serhack/patch-2 ... Update merchants.yml	2017-08-18 09:43:23 +02:00
Riccardo Spagni	37d0e1ed5f	Merge pull request #317 from b-i-t-n/master ... Adding user guide: mining with docker and xmrig	2017-08-18 09:42:52 +02:00
Riccardo Spagni	bf54e27ea2	Merge pull request #315 from jrob-io/master ... Fix 'Open Sans' @font-face declaration	2017-08-18 09:41:25 +02:00
Riccardo Spagni	4d24b53eed	Merge pull request #314 from QuickBASIC/rewrite-patch-1 ... Update _strings_en.yml	2017-08-18 09:41:12 +02:00
Riccardo Spagni	6de6c487cc	Merge pull request #313 from QuickBASIC/patch-1 ... Update people.md (Fluffypony Twitter Handle)	2017-08-18 09:39:56 +02:00
Riccardo Spagni	08aee1ec24	Merge pull request #312 from dEBRUYNE-1/master ... Logs for the Kovri and Dev meetings held on 2017-07-09, 2017-07-23, & 2017-08-06	2017-08-18 09:39:47 +02:00
Riccardo Spagni	04c5a422ee	Merge pull request #309 from mattcode55/topic-mine-to-pool ... First revision of pool mining user guide	2017-08-18 09:38:19 +02:00
tyrionmcmaster	dff51708fa	Update index.md	2017-08-17 15:20:17 -04:00
serhack	102763d6dd	Update merchants.yml	2017-08-15 09:35:06 +02:00
cryptochangements	3f45e51918	update remote-node-screenshot	2017-08-14 20:42:49 -05:00
cryptochangements34	5344ba695f	fixes moneroworld.org to moneroworld.com	2017-08-14 20:31:40 -05:00
dEBRUYNE-1	0940b123e0	Logs for the Community meeting held on 2017-08-13	2017-08-14 16:20:36 +02:00
cryptochangements34	848166e9a9	Add remote_node_gui	2017-08-13 16:29:21 -05:00
cryptochangements34	05d54c1535	Add user guide for using a remote node in the GUI ... A user guide for using moneroworld.com to fimd a remote node and connecting to it within the GUI wallet	2017-08-13 16:27:38 -05:00
cryptochangements	96fb6f82ff	Add remote_node screenshot	2017-08-13 16:22:07 -05:00
dEBRUYNE-1	9279ba7d6a	Logs for the Kovri and Dev meetings held on 2017-08-06	2017-08-07 17:25:43 +02:00
Matt Smith	a1044db850	Remove reference to Telegram ... Fix #343	2017-08-03 17:57:02 +01:00
dEBRUYNE-1	34acea5931	Logs for the Community meeting held on 2017-07-30	2017-08-03 12:08:56 +02:00
serhack	b7f8a747c4	Update merchants.yml	2017-07-29 14:00:12 +02:00
Jared Roberts	87b4b2a6c0	Use absolute units with background-position	2017-07-27 19:58:43 -04:00
Matt Smith	a68d5c96b8	Moneropedia: Tail emission: Remove reference to block	2017-07-24 20:13:20 +01:00
dEBRUYNE-1	86bd356de6	Logs for the Kovri and Dev meetings held on 2017-07-23	2017-07-24 18:40:18 +02:00
Njalla	67bbbe31de	remove newline	2017-07-24 15:35:25 +02:00
Njalla	b63f98cc41	s/privacy aware/privacy-aware	2017-07-23 18:43:38 +02:00
Matt Smith	79a6d7e0de	Create tail emission Moneropedia entry ... Fix #106	2017-07-23 11:20:01 +01:00
Matt Smith	7a45898fd7	Add #monero-research-lab to IRC channel list	2017-07-23 10:53:07 +01:00
njalla	ae8299ea9d	Add Njalla	2017-07-22 17:15:53 +02:00
SamsungGalaxyPlayer	955dc88c87	Update solo_mine_GUI.md ... Added some / before the start of the different filepaths.	2017-07-19 06:41:16 +02:00
SamsungGalaxyPlayer	f67f459aa9	Update solo_mine_GUI.md ... Updated again, changing .png to .PNG	2017-07-19 06:39:28 +02:00
SamsungGalaxyPlayer	c0b7829798	Update solo_mine_GUI.md	2017-07-19 06:37:01 +02:00