Skip to content

Commit 389e8bb

Browse files
TimidRobotTimidRobot
authored
Merge branch 'main' into main
2 parents 4f69690 + cd24875 commit 389e8bb

File tree

29 files changed

+553
-563
lines changed

29 files changed

+553
-563
lines changed

‎CODE_OF_CONDUCT.md

-13
This file was deleted.

‎CONTRIBUTING.md

-34
This file was deleted.

‎Pipfile.lock

+233-229
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,26 @@ via lektor (see [Deployment](#deployment), below).
2020
[ccopensource]: https://opensource.creativecommons.org/
2121

2222

23-
## Code of Conduct
23+
## Code of conduct
2424

25-
[`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md):
25+
[`CODE_OF_CONDUCT.md`][org-coc]:
2626
> The Creative Commons team is committed to fostering a welcoming community.
2727
> This project and all other Creative Commons open source projects are governed
2828
> by our [Code of Conduct][code_of_conduct]. Please report unacceptable
2929
> behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org)
3030
> per our [reporting guidelines][reporting_guide].
3131
32-
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/ "CC Open Source Code of Conduct — Creative Commons on GitHub"
33-
[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/ "Codes of Conduct Enforcement — Creative Commons on GitHub"
32+
[org-coc]: https://github.com/creativecommons/.github/blob/main/CODE_OF_CONDUCT.md
33+
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
34+
[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
3435

3536

3637
## Contributing
3738

38-
- See [`CONTRIBUTING.md`](CONTRIBUTING.md) for information on how to contribute
39+
See [`CONTRIBUTING.md`][org-contrib].
40+
41+
[org-contrib]: https://github.com/creativecommons/.github/blob/main/CONTRIBUTING.md
42+
3943
- See [Contributors to
4044
creativecommons/creativecommons.github.io-source][contributors] for a
4145
list of authors and their contributions to this project :blush:

‎content/blog/authors/TimidRobot/contents.lr

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Timid Robot Zehta
55
md5_hashed_email: 5324367e4af9d821ff3b388c04c42e7e
66
---
77
about:
8-
Timid Robot Zehta (please call them "Timid Robot") is the Core Systems Manager
9-
at [Creative Commons][creativecommons]. They are `@Timid Robot` on [CC
8+
Timid Robot Zehta (please call them "Timid Robot") is the [Director of
9+
Technology][ccperson] at Creative Commons. They are `@Timid Robot` on [CC
1010
Slack](/community/) and [TimidRobot][github] on GitHub.
1111

12-
[creativecommons]: https://creativecommons.org/author/timidcreativecommons-org/
12+
[ccperson]: https://creativecommons.org/person/timidcreativecommons-org/
1313
[github]: https://github.com/TimidRobot

‎content/blog/authors/annatuma/contents.lr

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ name: Anna Tumadóttir
55
md5_hashed_email: c6b98be141f57ce877a7ae10595b0ae0
66
---
77
about:
8-
Anna is the [Chief Operating Officer
9-
(COO)](https://creativecommons.org/author/annacreativecommons-org/) at Creative
10-
Commons. She's `@Anna` on the [CC Slack](/community/).
8+
Anna is the [Interm CEO/Chief Operating Officer (COO)][ccperson] at Creative
9+
Commons. She's `@Anna` on the [CC Slack](/community/).
10+
11+
[ccperson]: https://creativecommons.org/person/annacreativecommons-org/

‎content/blog/authors/obulat/contents.lr

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ name: Olga Bulat
55
md5_hashed_email: acd34b5434369aeaf31de8ea94368bf0
66
---
77
about:
8-
[Olga](https://creativecommons.org/author/obulat/) is a developer based in
9-
Istanbul, Turkey. She loves programming in Python and Javascript. Her main
10-
areas of interest are web development, Natural Language Processing, languages,
11-
geography and education. Apart from that, she is busy raising her (soon to be)
12-
three kids.
8+
Olga is a developer based in Istanbul, Turkey. She loves programming in Python
9+
and Javascript. Her main areas of interest are web development, Natural
10+
Language Processing, languages, geography and education. Apart from that, she
11+
is busy raising her (soon to be) three kids.
1312

14-
Olga is worked on improving the [CC License
15-
Chooser](https://github.com/creativecommons/cc-chooser) as part of [Outreachy
16-
December 2019 - March 2020](/programs/history/).
13+
Olga worked on improving the [ Chooser][chooser] as part of [Outreachy December
14+
2019 - March 2020](/programs/history/).
15+
16+
[chooser]: https://github.com/creativecommons/chooser

‎content/blog/authors/precious/contents.lr

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: Precious Oritsedere
55
md5_hashed_email: 799674ebf72ebba137da36402f2bab93
66
---
77
about:
8-
I am a front-end engineer. I build exceptional and problem-solving web applications. I am
9-
`@Precious oritsedere` on [CC Slack](/community/) and [PreciousOritsedere][github] on GitHub.
8+
I am a front-end engineer. I build exceptional and problem-solving web
9+
applications. I am `@Precious oritsedere` on [CC Slack](/community/) and
10+
[PreciousOritsedere][github] on GitHub.
1011

11-
[creativecommons]: https://creativecommons.org/author/saracreativecommons-org/
1212
[github]:https://github.com/PreciousOritsedere

‎content/blog/authors/sara/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: Sara Lovell
55
md5_hashed_email: 898c4d3ca8cabbee04ffe00bde6df9ab
66
---
77
about:
8-
Sara is the Full-Stack Engineer at [Creative Commons][creativecommons]. She is
8+
Sara is the [Full-Stack Engineer][ccperson] at Creative Commons]. She is
99
`@sara` on [CC Slack](/community/) and [possumbilities][github] on GitHub.
1010

11-
[creativecommons]: https://creativecommons.org/author/saracreativecommons-org/
11+
[ccperson]: https://creativecommons.org/person/saracreativecommons-org/
1212
[github]: https://github.com/possumbilities

‎content/blog/authors/shafiya/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: Shafiya Heena
55
md5_hashed_email: f49628fb50324d628379b469c7f008c6
66
---
77
about:
8-
Shafiya is the Systems Engineer at [Creative Commons][creativecommons]. She is
8+
Shafiya is the [Systems Engineer][ccperson] at Creative Commons. She is
99
`@shafiya` on [CC Slack](/community/) and [Shafiya-Heena][github] on GitHub.
1010

11-
[creativecommons]: https://creativecommons.org/author/shafiyacreativecommons-org/
11+
[ccperson]: https://creativecommons.org/person/shafiyacreativecommons-org/
1212
[github]: https://github.com/Shafiya-Heena

‎content/blog/categories/outreachy-2022/contents.lr

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
name: outreachy-2022

‎content/blog/entries/2023-01-04-how-i-landed-my-first-internship/contents.lr

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ categories:
44
open-source
55
collaboration
66
community
7+
outreachy-2022
8+
outreachy
79

810
---
911
author: precious

‎content/blog/entries/2023-02-01-outreachy-mid-point/contents.lr

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ categories:
44
open-source
55
collaboration
66
community
7+
outreachy-2022
8+
outreachy
79

810
---
911
author: precious

‎content/blog/entries/2023-08-25-machine-layer/contents.lr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ open-source
55
collaboration
66
cc-legal-tools
77
gsoc-2023
8+
gsoc
89
---
910
author: saurabh
1011
---
1112
pub_date: 2023-08-28
1213
---
1314
body:
1415

15-
![GSoC 2023 and CC](gsoc2023cc.png)
16-
1716
Greetings, readers!🌟 I'm excited to share that as part of Google Summer of
1817
Code (GSoC) 2023, I had the incredible opportunity to contribute to the
1918
exciting project "CC Legal Tools: Machine-Readable Layer." This journey has
2019
been a remarkable blend of learning, coding, and collaboration, and I'm
2120
thrilled to share the highlights of this journey with you all.
2221

22+
![GSoC 2023 and CC](gsoc2023cc.png)
2323

2424
## Project Overview
2525

‎content/contributing-code/contents.lr

+13-6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ are some of the ones that are most relevant to finding a good issue to work on:
3232
- You do not need our permission to work on one of these issues.
3333
- You may work on an issue labeled <span class="gh-label friendliness">good
3434
first issue</span> even if it's not your first issue.
35+
- Please don't ask for issue assignment or claim issues. Do the work and
36+
submit a pull request (PR).
37+
- Even if multiple people submit PRs for the same issue, multiple ideas and
38+
implementations strengthen the final product.
39+
- For work program applicants, each can all list their own PRs on their
40+
application. It is the quality of work that is important, not whether it
41+
is merged.
3542
- **Issues not available for community contribution:**
3643
- The following tags mark issues that are _not_ open for community
3744
contribution:
@@ -81,12 +88,10 @@ on.
8188
Once you've found an issue you'd like to work on, please follow these steps to
8289
make your contribution:
8390

84-
1. Comment on it and say you're working on that issue. This is to avoid
85-
conflicts with others also working on the issue. If you've followed the
86-
guidelines above, you don't need to ask permission to start work on an
87-
issue.
88-
2. Write your code and submit your pull request. Be sure to read and follow our
89-
**[pull request guidelines](/contributing-code/pr-guidelines/)!**
91+
1. If you have followed the guidelines above, you don't need to ask permission
92+
to start work on an issue.
93+
2. Write your code and submit your pull request (PR). Be sure to read and
94+
follow our **[pull request guidelines](/contributing-code/pr-guidelines/)!**
9095
3. Wait for code review and address any issues raised as soon as you can.
9196

9297
**A note on collaboration:** We encourage people to collaborate as much as
@@ -123,3 +128,5 @@ When in doubt, ask a question on [one of our community forums](/community/).
123128
Recurring donations to Creative Commons Open Source can be made via [Sponsor
124129
@creativecommons on GitHub
125130
Sponsors](https://github.com/sponsors/creativecommons).
131+
132+
Thank you to our [Supporters](/supporters/)!

0 commit comments

Comments
 (0)