Skip to content

Commit 60da7a2

Browse files
TimidRobotTimidRobot
authored
Merge branch 'master' into issue-604
2 parents db4f98d + 45adcf0 commit 60da7a2

File tree

8 files changed

+8291
-4705
lines changed

8 files changed

+8291
-4705
lines changed

‎content/internships/applicant-guide/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Here are some resources:
2323
- [Outreachy applicant guide][outreachyguide]
2424

2525
[gsocguide]: https://google.github.io/gsocguides/student/
26-
[gsodguide]: https://developers.google.com/season-of-docs/docs/tech-writer-guid
26+
[gsodguide]: https://developers.google.com/season-of-docs/docs/tech-writer-guide
2727
[outreachyguide]: https://www.outreachy.org/docs/applicant/
2828

2929

‎content/internships/contents.lr

+2-21
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ Creative Commons is not participating in the 2021 round of Google Season of
1818
Docs.
1919

2020
- [Program website](https://developers.google.com/season-of-docs/)
21-
- [CC's GSoD participants](https://developers.google.com/season-of-docs/docs/participants)
2221

2322

2423
### Google Summer of Code (GSoC)
2524

26-
27-
***Organization application in progress.***
25+
Creative Commons is not participating in the 2021 round of Google Summer of
26+
Code.
2827

2928
- [Program website](https://summerofcode.withgoogle.com/)
3029

@@ -51,21 +50,3 @@ Creative Commons is not participating in the 2021 May round of Outreachy.
5150
who are mentoring Creative Commons projects.
5251
- **[History](/internships/history/)**: This page has historical information on
5352
CC's open source internships, including links to prior interns' blog posts.
54-
55-
56-
## Mentors
57-
58-
Here are our mentors for 2021 GSoC:
59-
60-
| Name | Slack Username |
61-
| ---- | -------------- |
62-
| Abhishek Naidu | `@Abhishek Naidu` |
63-
| [Hugo Solar][authorhugo] | `@hugo` |
64-
| [Nimish Bongale][authornimish] | `@nimishnb` |
65-
| [Timid Robot Zehta][authortimidrobot] | `@Timid Robot` |
66-
| [Zack Krida][authorzack] | `@zack krida` |
67-
68-
[authorhugo]: /blog/authors/hugosolar/
69-
[authornimish]: /blog/authors/nimishbongale/
70-
[authortimidrobot]: /blog/authors/TimidRobot/
71-
[authorzack]: /blog/authors/zackkrida/

‎content/internships/history/contents.lr

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ first time in 2020.
2626

2727
CC has participated in Google Summer of Code (GSoC) nine times since 2006:
2828

29-
- *[All GSoC Open Source Blog posts]((/blog/categories/gsoc/)*
29+
- *[All GSoC Open Source Blog posts](/blog/categories/gsoc/)*
3030
- [Google Summer of Code 2020](https://summerofcode.withgoogle.com/archive/2020/organizations/5450793232105472/)
3131
- [Open Source Blog posts](/blog/categories/gsoc-2020/)
3232
- [Welcome Our Interns from Google Summer of Code and Outreachy!](https://creativecommons.org/2020/05/11/welcome-interns-google-summer-of-code-and-outreachy/)

‎databags/community_team_members.json

+113-88
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,103 @@
2222
}
2323
],
2424
"projects": [
25+
{
26+
"members": [
27+
{
28+
"github": "akmadian",
29+
"name": "Ari Madian",
30+
"role": "Project Maintainer"
31+
},
32+
{
33+
"github": "kgodey",
34+
"name": "Kriti Godey",
35+
"role": "Project Maintainer"
36+
},
37+
{
38+
"github": "obulat",
39+
"name": "Olga Bulat",
40+
"role": "Project Maintainer"
41+
},
42+
{
43+
"github": "zackkrida",
44+
"name": "Zack Krida",
45+
"role": "Project Maintainer"
46+
},
47+
{
48+
"github": "hemanth-hk",
49+
"name": "Hemanth Kumar",
50+
"role": "Project Contributor"
51+
},
52+
{
53+
"github": "JackieBinya",
54+
"name": "Jacqueline Binya",
55+
"role": "Project Contributor"
56+
}
57+
],
58+
"name": "License Chooser",
59+
"repos": "chooser"
60+
},
61+
{
62+
"members": [
63+
{
64+
"github": "dhruvkb",
65+
"name": "Dhruv Bhanushali",
66+
"role": "Project Maintainer"
67+
},
68+
{
69+
"github": "hugosolar",
70+
"name": "Hugo Solar",
71+
"role": "Project Maintainer"
72+
},
73+
{
74+
"github": "kgodey",
75+
"name": "Kriti Godey",
76+
"role": "Project Maintainer"
77+
},
78+
{
79+
"github": "zackkrida",
80+
"name": "Zack Krida",
81+
"role": "Project Maintainer"
82+
},
83+
{
84+
"github": "Dhruvi16",
85+
"name": "Dhruvi Butti",
86+
"role": "Project Core Committer"
87+
},
88+
{
89+
"github": "nimishbongale",
90+
"name": "Nimish Bongale",
91+
"role": "Project Core Committer"
92+
},
93+
{
94+
"github": "luninor",
95+
"name": "Ayan Choudhary",
96+
"role": "Project Collaborator"
97+
},
98+
{
99+
"github": "chidexebere",
100+
"name": "Chidiebere Onyegbuchulem",
101+
"role": "Project Collaborator"
102+
},
103+
{
104+
"github": "Tanuj22",
105+
"name": "Tanuj Agarwal",
106+
"role": "Project Collaborator"
107+
},
108+
{
109+
"github": "jahnvigupta",
110+
"name": "Jahnvi Gupta",
111+
"role": "Project Contributor"
112+
},
113+
{
114+
"github": "megha070",
115+
"name": "Megha Varshney",
116+
"role": "Project Contributor"
117+
}
118+
],
119+
"name": "Vocabulary",
120+
"repos": "vocabulary"
121+
},
25122
{
26123
"members": [
27124
{
@@ -39,6 +136,11 @@
39136
"name": "Kriti Godey",
40137
"role": "Project Maintainer"
41138
},
139+
{
140+
"github": "zackkrida",
141+
"name": "Zack Krida",
142+
"role": "Project Maintainer"
143+
},
42144
{
43145
"github": "ChariniNana",
44146
"name": "Charini Nanayakkara",
@@ -95,6 +197,11 @@
95197
"name": "Kriti Godey",
96198
"role": "Project Maintainer"
97199
},
200+
{
201+
"github": "zackkrida",
202+
"name": "Zack Krida",
203+
"role": "Project Maintainer"
204+
},
98205
{
99206
"github": "ariessa",
100207
"name": "Ariessa Norramli",
@@ -203,13 +310,18 @@
203310
"name": "Kriti Godey",
204311
"role": "Project Maintainer"
205312
},
313+
{
314+
"github": "zackkrida",
315+
"name": "Zack Krida",
316+
"role": "Project Maintainer"
317+
},
206318
{
207319
"github": "akmadian",
208320
"name": "Ari Madian",
209321
"role": "Project Core Committer"
210322
},
211323
{
212-
"github": "AyanChoudhary",
324+
"github": "luninor",
213325
"name": "Ayan Choudhary",
214326
"role": "Project Core Committer"
215327
},
@@ -327,37 +439,6 @@
327439
"name": "License Buttons",
328440
"repos": "licensebuttons"
329441
},
330-
{
331-
"members": [
332-
{
333-
"github": "akmadian",
334-
"name": "Ari Madian",
335-
"role": "Project Maintainer"
336-
},
337-
{
338-
"github": "kgodey",
339-
"name": "Kriti Godey",
340-
"role": "Project Maintainer"
341-
},
342-
{
343-
"github": "obulat",
344-
"name": "Olga Bulat",
345-
"role": "Project Maintainer"
346-
},
347-
{
348-
"github": "hemanth-hk",
349-
"name": "Hemanth Kumar",
350-
"role": "Project Contributor"
351-
},
352-
{
353-
"github": "JackieBinya",
354-
"name": "Jacqueline Binya",
355-
"role": "Project Contributor"
356-
}
357-
],
358-
"name": "License Chooser",
359-
"repos": "chooser"
360-
},
361442
{
362443
"members": [
363444
{
@@ -426,62 +507,6 @@
426507
"name": "Platform Toolkit",
427508
"repos": "mp"
428509
},
429-
{
430-
"members": [
431-
{
432-
"github": "dhruvkb",
433-
"name": "Dhruv Bhanushali",
434-
"role": "Project Maintainer"
435-
},
436-
{
437-
"github": "hugosolar",
438-
"name": "Hugo Solar",
439-
"role": "Project Maintainer"
440-
},
441-
{
442-
"github": "kgodey",
443-
"name": "Kriti Godey",
444-
"role": "Project Maintainer"
445-
},
446-
{
447-
"github": "Dhruvi16",
448-
"name": "Dhruvi Butti",
449-
"role": "Project Core Committer"
450-
},
451-
{
452-
"github": "nimishbongale",
453-
"name": "Nimish Bongale",
454-
"role": "Project Core Committer"
455-
},
456-
{
457-
"github": "AyanChoudhary",
458-
"name": "Ayan Choudhary",
459-
"role": "Project Collaborator"
460-
},
461-
{
462-
"github": "chidexebere",
463-
"name": "Chidiebere Onyegbuchulem",
464-
"role": "Project Collaborator"
465-
},
466-
{
467-
"github": "Tanuj22",
468-
"name": "Tanuj Agarwal",
469-
"role": "Project Collaborator"
470-
},
471-
{
472-
"github": "jahnvigupta",
473-
"name": "Jahnvi Gupta",
474-
"role": "Project Contributor"
475-
},
476-
{
477-
"github": "megha070",
478-
"name": "Megha Varshney",
479-
"role": "Project Contributor"
480-
}
481-
],
482-
"name": "Vocabulary",
483-
"repos": "vocabulary"
484-
},
485510
{
486511
"members": [
487512
{

‎databags/repos.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"language": null,
1010
"license": {
1111
"name": "MIT License",
12-
"url": "https://github.com/creativecommons/.github/blob/master/LICENSE"
12+
"url": "https://github.com/creativecommons/.github/blob/main/LICENSE"
1313
},
1414
"name": ".github",
1515
"slack": "",
@@ -66,7 +66,7 @@
6666
"url": "https://github.com/creativecommons/cc-licenses/blob/main/LICENSE"
6767
},
6868
"name": "cc-licenses",
69-
"slack": "",
69+
"slack": "cc-dev-licenses",
7070
"technologies": [
7171
"Python",
7272
"HTML"
@@ -104,7 +104,7 @@
104104
"language": "Python",
105105
"license": {
106106
"name": "MIT License",
107-
"url": "https://github.com/creativecommons/cc-link-checker/blob/master/LICENSE"
107+
"url": "https://github.com/creativecommons/cc-link-checker/blob/main/LICENSE"
108108
},
109109
"name": "cc-link-checker",
110110
"slack": "cc-dev-linkchecker",
@@ -504,7 +504,7 @@
504504
"language": "PHP",
505505
"license": {
506506
"name": "MIT License",
507-
"url": "https://github.com/creativecommons/creativecommons-certificate/blob/master/LICENSE"
507+
"url": "https://github.com/creativecommons/creativecommons-certificate/blob/main/LICENSE"
508508
},
509509
"name": "creativecommons-certificate",
510510
"slack": "",
@@ -1052,7 +1052,7 @@
10521052
"url": "https://github.com/creativecommons/wp-plugin-creativecommons/blob/master/license.txt"
10531053
},
10541054
"name": "wp-plugin-creativecommons",
1055-
"slack": "",
1055+
"slack": "cc-dev-wordpress",
10561056
"technologies": [
10571057
"PHP",
10581058
"CSS",

0 commit comments

Comments
 (0)