Commit Graph

1367 Commits

Author SHA1 Message Date
luigi1111
479f7347b4 Merge !154
v1docq47: video creation / translations into russian (august 2020 - january 2021)

See merge request monero-project/ccs-proposals!154
2020-08-22 17:07:33 +02:00
v1docq47
154ee9c8f3 v1docq47: video creation / translations into russian (august 2020 - january 2021) 2020-08-22 17:07:33 +02:00
luigi1111
c6e70b625a Merge branch 'xiphon-part-time-5' into 'master'
xiphon part-time coding

See merge request monero-project/ccs-proposals!157
2020-08-21 23:19:22 +02:00
xiphon
77723c3d94 xiphon part-time coding 2020-08-21 21:12:09 +00:00
luigi1111
6125d43e72 Merge ~161
Marking Tor/I2P milestone 2 completed.

See merge request monero-project/ccs-proposals!161
2020-08-21 23:03:16 +02:00
luigi1111
36cf824ba4 Update xiphon-part-time-4.md - done 2020-08-21 22:57:40 +02:00
luigi1111
ad97a2664b Update erciccione-website2.md - wip and ms1 2020-08-21 03:53:51 +02:00
Lee Clagett
777a1e6352 Marking milestone 2 completed. 2020-08-17 23:03:00 +02:00
luigi1111
78333e001a Update v1docq47-video-creation-translations-into-russian-(february-july-2020).md - cp 2020-08-08 23:04:23 +02:00
luigi1111
287a0f1f47 Update netrik182-mastering-monero-translation.md - done 2020-08-06 02:02:29 +02:00
Chris Avis
c6bf0309b1 Add new file 2020-08-04 11:58:44 +02:00
luigi1111
281c95e295 Update randybrito-locha-mesh.md - last ms and payout 2020-07-20 19:26:27 +02:00
luigi1111
3ec10c9cc7 Update research-post-quantum-monero.md - payout 2020-07-14 08:38:52 +02:00
Diego Salazar
0693bfa44f Update sarang-2020-q2.md 2020-07-10 19:58:20 +02:00
luigi1111
668bb783fb Merge !155
erciccione: update dates for proposal 'erciccione-website2.md'

See merge request monero-project/ccs-proposals!155
2020-07-10 17:20:03 +02:00
erciccione
ee8f69deb3
erciccione: update dates for proposal 'erciccione-website2.md' 2020-07-10 17:16:31 +02:00
luigi1111
d4b5a65a62 Update xiphon-part-time-4.md - ms 1&2 2020-07-06 19:06:44 +02:00
luigi1111
f29192a281 Update erciccione-website1.md - last ms -> cp 2020-07-06 09:03:23 +02:00
luigi1111
fd32fd2283 Merge !153
ErCiccione: 3 more months part time work on Getmonero.org (July-Sept)

See merge request monero-project/ccs-proposals!153
2020-07-01 17:16:07 +02:00
luigi1111
bfbad1e594 Update defcon-storage.md - correct date 2020-06-23 18:17:41 +02:00
luigi1111
b8c9d59978 Update sarang-2020-q3.md - wip and payout 2020-06-22 18:54:04 +02:00
luigi1111
e932bdf5f4 Update defcon-storage.md - cp + payout 2020-06-21 05:56:06 +02:00
erciccione
8779af47e8
ErCiccione: 3 more months part time work on Getmonero.org (July-Sept) 2020-06-20 08:48:35 +02:00
luigi1111
dc54d69660 Merge !151
Add missing reference to credit in CLSAG audit

See merge request monero-project/ccs-proposals!151
2020-06-19 03:48:53 +02:00
luigi1111
61825d84e0 Merge !152
Defcon equipment storage for one year

See merge request monero-project/ccs-proposals!152
2020-06-19 03:46:31 +02:00
luigi1111
3fbc95be06 Update clsag-audit-take2.md - wip and payout 2020-06-15 22:48:56 +02:00
Diego Salazar
225bff75aa Add new file 2020-06-15 09:24:06 +02:00
luigi1111
41dcb53eb2 Update sarang-2020-q3.md fr 2020-06-14 21:07:33 +02:00
luigi1111
2cc5339826 Merge branch 'sarang-2020-q3' into 'master'
Sarang: research funding for 2020 Q3

See merge request monero-project/ccs-proposals!148
2020-06-14 18:23:32 +02:00
Sarang Noether
6264f0f9f5 Sarang: research funding for 2020 Q3 2020-06-12 01:43:23 -04:00
Justin Ehrenhofer
9b11bbe848 Add missing reference to credit 2020-06-11 22:02:35 +02:00
luigi1111
c9b6dd8369 Merge !150
CLSAG Audit with Teserakt and OSTIF

See merge request monero-project/ccs-proposals!150
2020-06-11 21:16:10 +02:00
Justin Ehrenhofer
5f53a21cb9 CLSAG Audit with Teserakt and OSTIF 2020-06-11 21:16:10 +02:00
luigi1111
c66164137b Update Norwegian_translation_core.md -> wip 2020-06-08 19:34:55 +02:00
luigi1111
1e62159fe0 Update research-post-quantum-monero.md - wip 2020-06-08 19:31:22 +02:00
luigi1111
561592c22e Update erciccione-website1.md - ms2+payout 2020-06-07 22:14:02 +02:00
luigi1111
302414145e Update netrik182-mastering-monero-translation.md - wip 2020-06-05 16:18:11 +02:00
luigi1111
ac16ad8e77 Update adrelanos-debian-package.md - wip 2020-06-05 16:17:22 +02:00
luigi1111
1bcfd9e316 Update h4sh3d-atomic-swap-research.md - wip 2020-06-05 16:16:32 +02:00
Diego Salazar
3765f09f2c Update Norwegian_translation_core 2020-06-05 05:47:23 +02:00
Diego Salazar
71695cea82 Update Norwegian_translation_core 2020-06-05 05:46:24 +02:00
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