Commit Graph

288 Commits

Author SHA1 Message Date
luigi1111
d89c2d5ead Update monero-defcon-27-supplies.md - wip 2019-06-14 21:22:22 +02:00
luigi1111
e00795709d Update mooo-2019-07.md - wip 2019-06-14 21:21:48 +02:00
luigi1111
fd7c11dd77 Update sarang-2019-q3.md - wip 2019-06-14 21:20:57 +02:00
luigi1111
4004a9b891 Merge branch 'patch-2' into 'master'
Fixed May unfinished items to finished

See merge request monero-project/ccs-proposals!80
2019-06-13 02:12:52 +02:00
Diego Salazar
38495f8bd9 Update xmrhaelan-outreach-round-2.md 2019-06-13 01:55:57 +02:00
Diego Salazar
038e8d0f5d Update RandomX-audit.md 2019-06-13 01:04:29 +02:00
Diego Salazar
ce108ae654 Update live-test.md 2019-06-13 01:00:18 +02:00
Diego Salazar
9db566aa65 Update midipoet-represent_Monero_at_the_Oslo_Freedom_Forum_2019.md 2019-06-13 00:45:15 +02:00
v1docq47
9b4e753ade May update v1docq47-video-creation-translations-into-russian-(february-july).md 2019-06-12 07:10:06 +02:00
luigi1111
8812942847 Merge !77
Sarang: research funding for 2019 Q3

See merge request monero-project/ccs-proposals!77
2019-06-09 23:01:06 +02:00
luigi1111
6958e13f78 Update midipoet-represent_Monero_at_the_Oslo_Freedom_Forum_2019.md ms2 payout 2019-06-08 15:44:52 +02:00
Diego Salazar
6f771d466b Fixed formatting of Outreach 3 2019-06-06 22:25:51 +02:00
luigi1111
32b03b73bf Update mooo-2019-07.md - fix amount 2019-06-06 22:02:05 +02:00
Sarang Noether
916701ace5 Sarang: research funding for 2019 Q3 2019-06-06 06:25:44 -04:00
luigi1111
adf8278a92 Merge !70
Monero Outreach round 3

See merge request monero-project/ccs-proposals!70
2019-06-06 05:52:49 +02:00
xmrhaelan
5aaa180257 Monero Outreach round 3 2019-06-06 05:52:49 +02:00
luigi1111
89ef5bf842 Merge !75
Mooo's july 2019 ccs

See merge request monero-project/ccs-proposals!75
2019-06-06 05:40:27 +02:00
luigi1111
a9e8e62d27 Update RandomX-audit.md 2019-06-06 00:35:59 +02:00
moneromooo-monero
2b0686f7ba
Mooo's july 2019 ccs 2019-06-04 21:25:14 +00:00
Diego Salazar
99598c2d2d Update with correct url and test backend change 2019-05-29 22:57:17 +02:00
Diego Salazar
d0ec03cf54 Merge branch 'update' into 'master'
Update monero-defcon-27-supplies.md

See merge request monero-project/ccs-proposals!74
2019-05-28 23:40:26 +02:00
ajs
00dd2a221a Update monero-defcon-27-supplies.md 2019-05-28 23:40:26 +02:00
Diego Salazar
4e8c962eca Update rehrar-defcon-reimburse-2019.md 2019-05-28 02:00:05 +02:00
Diego Salazar
82b79709cb Updated with correct values, and correct formatting. 2019-05-28 01:58:35 +02:00
luigi1111
eb912c1f7e Merge !71
Monero Defcon 27 Supplies

See merge request monero-project/ccs-proposals!71
2019-05-27 21:01:00 +02:00
ajs
b5eda96afa Monero Defcon 27 Supplies 2019-05-27 21:01:00 +02:00
luigi1111
a2979b1727 Merge !69
Defcon Reimburse (third time's' the charm)

See merge request monero-project/ccs-proposals!69
2019-05-27 20:57:24 +02:00
luigi1111
00607596c5 Merge !66
RandomX audits

See merge request monero-project/ccs-proposals!66
2019-05-22 23:44:40 +02:00
Howard Chu
db6813f17e Note that unspent funds go back to general fund - like for any other CCS proposal 2019-05-22 20:11:17 +01:00
Howard Chu
146039be28 Clarification of incremental funding structure
And some deadlines
2019-05-22 02:05:36 +01:00
Diego Salazar
63e084368a Add new file 2019-05-21 05:07:26 +02:00
Diego Salazar
80a6c2abcb Merge branch 'revert-5a636149' into 'master'
Revert "Merge branch 'defcon-reimburse' into 'master'"

See merge request monero-project/ccs-proposals!68
2019-05-21 05:00:20 +02:00
Diego Salazar
d063cf00ff Revert "Merge branch 'defcon-reimburse' into 'master'"
This reverts merge request !67
2019-05-21 04:57:45 +02:00
Diego Salazar
5a6361491b Merge branch 'defcon-reimburse' into 'master'
Add Defcon Reimburse Proposal

See merge request monero-project/ccs-proposals!67
2019-05-21 04:57:27 +02:00
Diego Salazar
90df03e087 Add Defcon Reimburse Proposal 2019-05-21 03:05:34 +02:00
Diego Salazar
d62434b6be Delete rehrar-defcon-reimburse-2019.md 2019-05-21 03:02:26 +02:00
Diego Salazar
843aa578ca Added Defcon Reimbursement Proposal 2019-05-21 03:01:24 +02:00
Howard Chu
6b3e885d1c RandomX audits 2019-05-20 20:25:37 +01:00
luigi1111
84ec1a6477 ms1 payout midipoet-represent_Monero_at_the_Oslo_Freedom_Forum_2019.md 2019-05-15 20:52:52 +02:00
Diego Salazar
42a722b478 Update live-test.md 2019-05-14 19:48:26 +02:00
Diego Salazar
727fd7a52e Update knueffelbund-gui-design-for-q2-2019.md 2019-05-14 19:47:25 +02:00
Diego Salazar
9b7a9b5bb2 Update xiphon-part-time.md 2019-05-14 19:46:55 +02:00
Diego Salazar
f2835a9f17 Update dsc-2019-q2.md 2019-05-14 19:46:11 +02:00
Diego Salazar
160898b21e Update midipoet-represent_Monero_at_the_Oslo_Freedom_Forum_2019.md 2019-05-14 19:43:51 +02:00
Diego Salazar
e7a7eef188 Update mooo-2019-04.md 2019-05-14 19:37:07 +02:00
Diego Salazar
71fd69bfa7 Update sarang-2019-q1.md 2019-05-14 19:30:32 +02:00
Diego Salazar
1d73e3bed6 Update el00ruobuob-january-to-march-part-time-for-a-new-quarter.md 2019-05-14 19:25:34 +02:00
luigi1111
00126722c3 Merge !64
Monero representation at the Oslo Freedom Forum 2019

See merge request monero-project/ccs-proposals!64
2019-05-09 00:06:21 +02:00
midipoet
7ecc16583f Monero representation at the Oslo Freedom Forum 2019 2019-05-09 00:06:21 +02:00
luigi1111
e46bca8009 Update v1docq47-video-creation-translations-into-russian-(february-july).md 2019-05-07 22:03:16 +02:00