Commit Graph

52 Commits

Author SHA1 Message Date
Diego Salazar
ae64b9a809 Update v1docq47-video-creation-translations-into-russian-(february-july).md 2019-03-18 21:09:22 +01:00
luigi1111
fb1bfa7c2f Merge !46
mooo's april coding

See merge request monero-project/ccs-proposals!46
2019-03-18 21:06:22 +01:00
luigi1111
77a60dd1ce Merge !33
pwrcycle-Defcon_Monero_Party_2019

See merge request monero-project/ccs-proposals!33
2019-03-18 21:04:36 +01:00
luigi1111
ef675d03ab Merge !32
v1docq47: video creation / translations into russian (february - july)

See merge request monero-project/ccs-proposals!32
2019-03-18 21:03:59 +01:00
pwrcycle
b17cfb96fa Update pwrcycle-Defcon_Monero_Party_2019.md corrected to say Defcon 27 instead of Defcon 26. 2019-03-15 22:45:57 +01:00
moneromooo-monero
dfdeed162d
mooo's april coding 2019-03-15 20:37:39 +00:00
luigi1111
1a362cb60d Merge !34
Sarang: research funding for 2019 Q2

See merge request monero-project/ccs-proposals!34
2019-03-13 21:46:09 +01:00
Sarang Noether
407420bffb Added request total to markdown description 2019-03-13 17:11:00 +00:00
Diego Salazar
b43eba35a4 Merge branch 'cont-funding-surae-sep-nov-2018' into 'master'
Continued funding for Surae for another quarter, September October November 2018

See merge request monero-project/ccs-proposals!40
2019-03-13 03:58:44 +01:00
Diego Salazar
a1327d3195 Merge branch 'oneiric-kovri-june-aug-2018' into 'master'
oneiric: June-August part-time Kovri junior developer

See merge request monero-project/ccs-proposals!39
2019-03-13 03:58:13 +01:00
Diego Salazar
9e9788616c Merge branch 'el00ruobuob-oct-dec-2018' into 'master'
el00ruobuob: Part Time for a new quarter (Oct-Dec)

See merge request monero-project/ccs-proposals!38
2019-03-13 03:57:42 +01:00
Xeagu
74b2c5bfef Update cont-funding-surae-sep-nov-2018.md 2019-03-13 01:01:30 +01:00
Xeagu
c907741e92 Update cont-funding-surae-sep-nov-2018.md 2019-03-13 01:01:11 +01:00
Xeagu
bd46957545 Add new file 2019-03-13 01:00:10 +01:00
Xeagu
752d735c07 Add new file 2019-03-13 00:41:43 +01:00
Xeagu
dd806d5b22 Update el00ruobuob-oct-dec-2018.md 2019-03-13 00:32:27 +01:00
Xeagu
351515673d Update el00ruobuob-oct-dec-2018.md 2019-03-13 00:31:56 +01:00
Xeagu
eff6d5487e Add new file 2019-03-13 00:31:28 +01:00
Diego Salazar
b43c7134e1 Merge branch 'noethers-stanford-blockchain-conference-2019' into 'master'
Noethers: Attend Stanford Blockchain Conference 2019

See merge request monero-project/ccs-proposals!37
2019-03-12 21:38:30 +01:00
Diego Salazar
48bdbe3e4a Merge branch 'tor-tx-broadcasting' into 'master'
Broadcast Transactions over Tor Hidden Service

See merge request monero-project/ccs-proposals!31
2019-03-12 21:38:05 +01:00
Lucas Ziemba
15c655a434 Update noethers-stanford-blockchain-conference-2019.md 2019-03-12 21:32:21 +01:00
Lucas Ziemba
4fcb6288a2 Add new file 2019-03-12 21:25:31 +01:00
Diego Salazar
461382538c Update m2049r-sep-nov-2018 2019-03-12 21:15:03 +01:00
Diego Salazar
a874c2f4a2 Merge branch 'm2049r-sep-nov-2018' into 'master'
M2049R: PART-TIME SEPTEMBER-NOVEMBER

See merge request monero-project/ccs-proposals!36
2019-03-12 21:10:18 +01:00
Lucas Ziemba
006af4d214 Update m2049r-sep-nov-2018 2019-03-12 21:06:59 +01:00
Lucas Ziemba
2b5f2dbd4e Update m2049r-sep-nov-2018 2019-03-12 20:58:08 +01:00
Lucas Ziemba
634d4dc640 Add new file 2019-03-12 20:50:24 +01:00
Diego Salazar
e77d2bac48 Merge branch 'sarang-2019-q1' into 'master'
Sarang: research funding for 2019 Q1

See merge request monero-project/ccs-proposals!35
2019-03-12 20:03:27 +01:00
Sarang Noether
a334ea7b07 Sarang: research funding for 2019 Q1 2019-03-12 18:58:56 +00:00
Sarang Noether
789a79effa Minor typesetting fix 2019-03-12 14:52:18 +00:00
Sarang Noether
5ca2756505 Sarang: research funding for 2019 Q2 2019-03-12 14:11:38 +00:00
pwrcycle
c5e272bda8 Update pwrcycle-Defcon_Monero_Party_2019.md added more specific estimates for use of funds. 2019-03-12 03:39:30 +01:00
pwrcycle
2dcb26925d Add new file 2019-03-11 23:56:20 +01:00
Lee Clagett
dade3214c8 Changed layout to wip, and added completion (merge) date for first milestone. 2019-03-10 06:07:08 +01:00
v1docq47
46bbaed9a0 Update v1docq47-video-creation-translations-into-russian-(february-july).md 2019-03-09 13:54:51 +01:00
Diego Salazar
dff17449a7 Fix front matter so it can be displayed in the site 2019-03-07 17:38:06 +01:00
luigi1111
c368fe83a3 Merge !29
el00ruobuob: JANUARY TO MARCH (PART TIME FOR A NEW QUARTER)

See merge request monero-project/ccs-proposals!29
2019-03-07 09:05:41 +01:00
Lee Clagett
800e81a802 Adding tx broadcasting tor proposal (already accepted + funded on old ffs) 2019-03-07 02:34:23 +01:00
Diego Salazar
76c96d9df6 Update getmonero-redesign.md 2019-03-05 17:16:55 +01:00
Diego Salazar
71cdcddc18 Change Live Test to General Fund donation 2019-03-05 17:10:48 +01:00
Diego Salazar
4c15791924 Readd live-test for full removal 2019-03-05 17:07:31 +01:00
Diego Salazar
ba2809a339 Delete live-test.md 2019-03-05 16:55:15 +01:00
Diego Salazar
4aa3927207 Update live-test.md 2019-03-05 08:01:58 +01:00
Diego Salazar
f445cf46ad Update live-test.md 2019-03-05 07:59:03 +01:00
el00ruobuob
453e4895fe
el00ruobuob proposal from FFS for Jan-Mar 2019-03-05 07:28:51 +01:00
Diego Salazar
bce44655e5 Merge branch 'live-test' into 'master'
Live Test

See merge request monero-project/ccs-proposals!28
2019-02-19 16:33:37 +01:00
Diego Salazar
c6e7eff242 Add new file 2019-02-19 16:32:13 +01:00
Diego Salazar
a015153093 Merge branch 'remove-ffs' into 'master'
Removed all "ffs" from layouts

See merge request monero-project/ccs-proposals!23
2019-01-28 02:02:21 +01:00
Diego Salazar
e0a793ad00
Removed all "ffs" from layouts 2019-01-27 18:01:29 -07:00
Diego Salazar
4459b497ee Merge branch 'restructure' into 'master'
Moved proposals to root of repository

See merge request monero-project/ffs-proposals!2
2018-12-20 18:34:35 +01:00