Commit Graph

918 Commits

Author SHA1 Message Date
Matt Smith
bed1447992 Improve styling of hangouts page
The IRC channels were too cramped together, move them further apart with
some more padding.
2017-09-02 20:54:26 +01:00
Matt Smith
7696a933bf Add more channels to irc.yml
* Add #monero-ffs
* Add #monero-offtopic
2017-09-02 20:49:31 +01:00
Matt Smith
79190ecdc9 Generate irc section from irc.yml 2017-09-02 20:44:17 +01:00
Matt Smith
4327f3dfda Create irc.yml
Create a data file for storing all IRC channels.
2017-09-02 20:36:21 +01:00
Riccardo Spagni
3eae808620 Merge pull request #367 from QuickBASIC/issue-kludge
Add Github Housekeeping Section to README.md
2017-08-31 11:25:09 +02:00
Riccardo Spagni
b5d5c56063 Merge pull request #363 from qertoip/bundler
Make the setup easier and more repeatable by using Bundler
2017-08-31 11:24:08 +02:00
Riccardo Spagni
80d337b83f Merge pull request #361 from qertoip/remove-inactive-merchants
Remove inactive merchants (websites long down)
2017-08-31 11:22:08 +02:00
Riccardo Spagni
1836a3a7b0 Merge pull request #359 from tyrionmcmaster/patch-2
Update Home Page
2017-08-31 11:21:25 +02:00
Riccardo Spagni
15b92ec4dc Merge pull request #353 from KeeJef/master
Importing the Blockchain users guide
2017-08-31 11:20:01 +02:00
Riccardo Spagni
872fba650f Merge pull request #351 from timotgl/master
Fix typo in "your hashrate"
2017-08-31 11:19:24 +02:00
Riccardo Spagni
c2267e718f Merge pull request #350 from tyrionmcmaster/patch-1
Update "What is Monero" page
2017-08-31 11:19:08 +02:00
Riccardo Spagni
4da0365423 Merge pull request #348 from cryptochangements34/master
Add user guide for connecting to a remote node within the GUI
2017-08-31 11:18:52 +02:00
Riccardo Spagni
d7c6fc2654 Merge pull request #332 from SamsungGalaxyPlayer/master
Add GUI solo mining guide
2017-08-31 11:18:18 +02:00
Riccardo Spagni
e7387e39a1 Merge pull request #320 from erciccione/merch
Updates merchants list
2017-08-31 11:16:47 +02:00
Riccardo Spagni
4a33be9f33 Merge pull request #282 from anonimal/VRP
Repo: add Vulnerability Response Process
2017-08-31 11:14:47 +02:00
Riccardo Spagni
b6f0dff227
update text blocks in disclosure post 2017-08-28 19:38:31 +02:00
Riccardo Spagni
ff3c982baa
update CN bug blog post, add commitment texts 2017-08-28 19:28:26 +02:00
Mike
d55e083a62 Add Github Housekeeping Section to README.md
The following Issues are either already fixed by the site redesign, fixed by a pull request by a contributor, or have comments from @rerhar requesting closure:
closes #1
closes #5
closes #17
closes #49
closes #56
closes #62
closes #101
closes #109
closes #111
closes #142
closes #180
closes #181
closes #195
closes #199
closes #214
closes #221
2017-08-25 14:52:04 -04:00
tyrionmcmaster
3cb118d363 Update index.html 2017-08-24 23:50:52 -04:00
qertoip
a9c82a0354 Remove inactive merchants (websites long down) 2017-08-24 23:28:48 +02:00
qertoip
fe107793f1 Make the setup easier and more repeatable by using Bundler 2017-08-24 23:27:10 +02:00
tyrionmcmaster
602e4c29e1 Update index.html
Thank you everyone for your input. Please let me know if this is an improvement.
2017-08-23 12:14:55 -04:00
tyrionmcmaster
9a6d99e7b6 Update Home Page
Please review and comment.
2017-08-22 14:25:14 -04:00
tyrionmcmaster
5d422aac6d Update index.md 2017-08-22 13:54:08 -04:00
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