Commit Graph

1010 Commits

Author SHA1 Message Date
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
luigi1111
80347c66cd Merge !59
Fixed unfinished items to finished.

See merge request monero-project/ccs-proposals!59
2019-05-06 21:26:38 +02:00
v1docq47
3a5570e953 Fixed unfinished items to finished. 2019-05-06 21:26:38 +02:00
luigi1111
30478955b2 Merge !57
dsc fulltime GUI coding

See merge request monero-project/ccs-proposals!57
2019-04-22 20:29:15 +02:00
luigi1111
70b968560b Merge !55
xiphon part time coding

See merge request monero-project/ccs-proposals!55
2019-04-20 00:45:10 +02:00
luigi1111
5b6d2dc24f Merge !54
knueffelbund GUI design for Q2 2019

See merge request monero-project/ccs-proposals!54
2019-04-20 00:44:19 +02:00
xmrdsc
1e03de39c2 dsc-2019-q2 2019-04-17 20:18:38 +02:00
luigi1111
e458e7ed61 Merge !53
ErCiccione: Coordinator of the Localization Workgroup - March

See merge request monero-project/ccs-proposals!53
2019-04-12 09:49:18 +02:00
luigi1111
f1c242a10d Update surae-mrl-research-q2-2019.md 2019-04-11 21:48:03 +02:00
erciccione
6f045dfbf6
add Erciccione's proposal 2019-04-07 20:32:07 +02:00
xiphon
97fc5eb900 xiphon part time coding 2019-04-05 23:05:00 +00:00
Diego Salazar
a1128befb9 Updated milestones and payouts with correct info from forum.getmonero.org 2019-04-05 21:42:11 +02:00
Christoph Ono
464ce5df42 Add new file 2019-04-04 09:20:58 +02:00
Diego Salazar
ce2c2f0fd2 Merge branch 'outreach-round-2' into 'master'
Monero Outreach quarterly and ongoing task funding

See merge request monero-project/ccs-proposals!45
2019-04-04 04:08:18 +02:00
luigi1111
1c9b9f242f Update el00ruobuob-january-to-march-part-time-for-a-new-quarter.md 2019-04-03 23:05:01 +02:00
luigi1111
fdb241baa7 Update el00ruobuob-january-to-march-part-time-for-a-new-quarter.md 2019-04-03 23:02:51 +02:00
luigi1111
62bf87ec51 Update pwrcycle-Defcon_Monero_Party_2019.md 2019-04-03 23:00:12 +02:00
luigi1111
62b1a0faf0 Update mooo-2019-04.md 2019-04-03 22:59:22 +02:00
luigi1111
6d1f5de105 Update surae-mrl-research-q2-2019.md 2019-04-03 22:58:50 +02:00
luigi1111
e26f9b1a81 Update v1docq47-video-creation-translations-into-russian-(february-july).md 2019-04-03 22:58:27 +02:00
luigi1111
8195c73526 Update el00ruobuob-january-to-march-part-time-for-a-new-quarter.md 2019-04-03 22:55:56 +02:00
luigi1111
4909cfbea0 Merge branch 'el00ruobuob_jan-mar_19' into 'master'
Correct date in el00ruobuob CCS proposal

See merge request monero-project/ccs-proposals!52
2019-04-03 22:53:00 +02:00
luigi1111
44fd3f5229 Payout sarang-2019-q2 ms1 2019-03-31 19:32:30 +02:00
Diego Salazar
682a218d7c Update sarang-2019-q2.md according to changes requested in https://repo.getmonero.org/monero-project/ccs-proposals/merge_requests/34#note_5659 2019-03-31 18:39:39 +02:00
el00ruobuob
132418eded
Correct date 2019-03-28 15:54:17 +01:00
luigi1111
0cf9dac62a Merge !50
Surae funding Q2 2019

See merge request monero-project/ccs-proposals!50
2019-03-24 23:48:29 +01:00
xmrhaelan
c43523365f Update xmrhaelan-outreach-round-2.md
Fixed unfinished items to finished.
2019-03-23 12:54:50 +01:00
Diego Salazar
ab58d4367f Update pwrcycle-Defcon_Monero_Party_2019.md 2019-03-18 21:16:36 +01:00
Diego Salazar
d4d26c5756 Update pwrcycle-Defcon_Monero_Party_2019.md 2019-03-18 21:10:08 +01:00