Commit Graph

776 Commits

Author SHA1 Message Date
Diego Salazar
a71805e1e1 Merge branch 'Norwegian_translation_core' into 'master'
Norwegian translation of core part

See merge request monero-project/ccs-proposals!141
2020-06-05 05:45:57 +02:00
luigi1111
e2986a63df Merge !145
Monero Atomic Swaps research funding

See merge request monero-project/ccs-proposals!145
2020-06-05 04:16:49 +02:00
h4sh3d
25b0349562 Monero Atomic Swaps research funding 2020-06-05 04:16:48 +02:00
Diego Salazar
a5c0628801 Merge branch 'clsag-audit' into 'master'
CLSAG Audit with Teserakt and OSTIF

See merge request monero-project/ccs-proposals!149
2020-06-04 20:26:03 +02:00
Justin Ehrenhofer
91121c2f42 CLSAG Audit with Teserakt and OSTIF 2020-06-04 20:26:03 +02:00
luigi1111
56ebd7adf4 Update v1docq47-video-creation-translations-into-russian-(february-july-2020).md - April, May, payout 2020-06-02 23:55:22 +02:00
luigi1111
1c92575627 Update randybrito-locha-mesh.md - update ms2 + payout 2020-05-26 22:37:32 +02:00
luigi1111
b28e61334f Update randybrito-locha-mesh.md - ms1 + payout 2020-05-26 22:33:03 +02:00
Diego Salazar
d6bf6ac97b Attempted fix. 2020-05-26 04:38:15 +02:00
luigi1111
f646051639 Merge !142
Research post-quantum strategies for Monero

See merge request monero-project/ccs-proposals!142
2020-05-21 20:11:14 +02:00
Mitchell P. Krawiec-Thayer
f53ae4cce9 Updating the cost to reflect today's exchange rate of 65 USD/XMR, and added notes to the resources section about option #2 2020-05-21 20:11:14 +02:00
luigi1111
2721d8dec5 Update sarang-2020-q2.md - fix payout amount 2020-05-20 01:11:13 +02:00
luigi1111
83a4ced33e Update vtnerd-tor-tx-broadcasting.md - add old payout/fix dates 2020-05-20 01:08:16 +02:00
luigi1111
d8e5ec4395 Update erciccione-website1.md - ms1 2020-05-15 23:10:43 +02:00
luigi1111
4ff8a47eea Merge !143
Translation of Mastering Monero into Brazilian Portuguese

See merge request monero-project/ccs-proposals!143
2020-05-12 21:41:44 +02:00
netrik182
7cc7fc86be Fix netrik182-mastering-monero-translation.md 2020-05-12 21:36:31 +02:00
luigi1111
571ebb1de9 Merge !137
Translation of Mastering Monero into Brazilian Portuguese

See merge request monero-project/ccs-proposals!137
2020-05-09 19:15:36 +02:00
netrik182
35e7f2c841 Translation of Mastering Monero into Brazilian Portuguese 2020-05-09 19:15:36 +02:00
luigi1111
f5c80be98b Update xiphon-part-time-4.md - wip 2020-05-05 23:00:06 +02:00
luigi1111
3cd1366d62 Update xiphon-part-time-3.md - all ms -> cp 2020-05-05 06:51:48 +02:00
luigi1111
05082c9570 Update xmrhaelan-monero-outreach-round-3.md - ms&payout 1 2020-05-04 22:10:32 +02:00
Chris Avis
a35b797ac2 Norwegian translation of core part 2020-04-25 09:21:17 +02:00
Diego Salazar
5a924c88a9 Fix norwegian translation 2020-04-21 20:31:38 +02:00
Diego Salazar
216fe34f30 Try one more time 2020-04-21 04:05:39 +02:00
Diego Salazar
3fc485d370 Update adrelanos-debian-package.md 2020-04-21 03:51:16 +02:00
luigi1111
6e086f0102 Merge !139
xiphon part-time coding

See merge request monero-project/ccs-proposals!139
2020-04-21 03:50:59 +02:00
Diego Salazar
4afd2d1e99 Deleting non-working avis translation 2020-04-21 03:45:22 +02:00
Diego Salazar
f5c3da9fd7 Resubmit Chris proposal 2020-04-21 03:41:47 +02:00
luigi1111
619f4d19a0 Update surae-q4-funding-2019.md - cp 2020-04-21 03:41:33 +02:00
luigi1111
883cd5275c Update sarang-2020-q1.md - cp 2020-04-21 03:40:54 +02:00
Diego Salazar
c683dd55a9 Fix again avis translation 2020-04-21 03:40:16 +02:00
luigi1111
3fb4673577 Update serhack-monero-integrations-part-3.md - wip 2020-04-21 03:39:48 +02:00
luigi1111
7edcb8092f Update randybrito-locha-mesh.md - wip 2020-04-21 03:38:43 +02:00
luigi1111
81cfa74d45 Merge !130
Monero Debian Package Repository for 2 years

See merge request monero-project/ccs-proposals!130
2020-04-21 03:37:13 +02:00
Patrick Schleizer
02062e771a extend maintainance from two years to two and half years;
adjust timeline due to delay from recent volatility;
adjust amount of XMR due to recent volatility;
minor clarifications
2020-04-21 03:37:13 +02:00
xiphon
47e3a0de6f xiphon part-time coding 2020-04-20 19:11:05 +00:00
luigi1111
6c2fb787f7 Update xiphon-part-time-3.md - wip 2020-04-18 19:47:29 +02:00
Diego Salazar
8d47e17a5c Move to WIP 2020-04-15 20:41:07 +02:00
Diego Salazar
efbeea5bb9 Fix so Norwegian translation will show up in FR 2020-04-15 18:55:17 +02:00
luigi1111
8a348aeeed Merge !129
Norwegian translation of webplate + footers + nav. menu

See merge request monero-project/ccs-proposals!129
2020-04-14 20:22:11 +02:00
luigi1111
43e6818af4 Update mooo-2019-11.md - ms1 & 2 2020-04-14 19:33:57 +02:00
luigi1111
02a9dd7eaf Update ErCiccione-website-jan-march.md - cp 2020-04-05 21:06:14 +02:00
luigi1111
0f269fe45c Merge !134
erciccione: part time work (April-May) on Getmonero.org

See merge request monero-project/ccs-proposals!134
2020-04-05 21:04:11 +02:00
luigi1111
11f831231c Update v1docq47-video-creation-translations-into-russian-(february-july-2020).md - remove milestone dates for unfinished 2020-04-02 01:56:41 +02:00
luigi1111
a92b15a158 Update v1docq47-video-creation-translations-into-russian-(february-july-2020).md - wip + ms1&2 + payout 2020-03-31 22:20:45 +02:00
erciccione
d99eeb04e3
erciccione part time getmonero april-june 2020-03-28 10:40:04 +01:00
luigi1111
cfb0ea3a08 Update sarang-2020-q2.md - wip, ms1, and payout 2020-03-19 19:58:11 +01:00
luigi1111
95cada874e Update sarang-2020-q2.md - new target 2020-03-18 19:35:25 +01:00
luigi1111
6d26873a8c Merge !131
Sarang: research funding for 2020 Q2

See merge request monero-project/ccs-proposals!131
2020-03-16 02:43:46 +01:00
Sarang Noether
9168810e4c Sarang: research funding for 2020 Q2 2020-03-14 12:47:50 -04:00