Skip to content

Commit f85f4ea

Browse files
committed
Merge branch 'main' of github.com:softwaresaved/up-goer-five
2 parents 40ed9a8 + 4a736de commit f85f4ea

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

.all-contributorsrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
"avatar_url": "https://avatars.githubusercontent.com/u/1590010?v=4",
3333
"profile": "https://orcid.org/0000-0002-9324-2775",
3434
"contributions": [
35-
"content"
35+
"content",
36+
"ideas",
37+
"research"
3638
]
3739
},
3840
{

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ This was made at [CW26](https://www.software.ac.uk/workshop/collaborations-works
3636
<tbody>
3737
<tr>
3838
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SaranjeetKaur"><img src="https://avatars.githubusercontent.com/u/28556616?v=4?s=100" width="100px;" alt="Saranjeet Kaur"/><br /><sub><b>Saranjeet Kaur</b></sub></a><br /><a href="#content-SaranjeetKaur" title="Content">🖋</a></td>
39+
<td align="center" valign="top" width="14.28%"><a href="https://orcid.org/0000-0002-9324-2775"><img src="https://avatars.githubusercontent.com/u/1590010?v=4?s=100" width="100px;" alt="Paddy McCann"/><br /><sub><b>Paddy McCann</b></sub></a><br /><a href="#content-pgmccann" title="Content">🖋</a> <a href="#ideas-pgmccann" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-pgmccann" title="Research">🔬</a></td>
40+
<td align="center" valign="top" width="14.28%"><a href="http://www.software.ac.uk"><img src="https://avatars.githubusercontent.com/u/1507151?v=4?s=100" width="100px;" alt="Neil Chue Hong"/><br /><sub><b>Neil Chue Hong</b></sub></a><br /><a href="#content-npch" title="Content">🖋</a> <a href="#research-npch" title="Research">🔬</a></td>
3941
<td align="center" valign="top" width="14.28%"><a href="http://www.lannelongue-group.org"><img src="https://avatars.githubusercontent.com/u/22586038?v=4?s=100" width="100px;" alt="Loïc Lannelongue"/><br /><sub><b>Loïc Lannelongue</b></sub></a><br /><a href="#projectManagement-Llannelongue" title="Project Management">📆</a></td>
40-
<td align="center" valign="top" width="14.28%"><a href="https://orcid.org/0000-0002-9324-2775"><img src="https://avatars.githubusercontent.com/u/1590010?v=4?s=100" width="100px;" alt="Paddy McCann"/><br /><sub><b>Paddy McCann</b></sub></a><br /><a href="#content-pgmccann" title="Content">🖋</a></td>
41-
<td align="center" valign="top" width="14.28%"><a href="http://www.software.ac.uk"><img src="https://avatars.githubusercontent.com/u/1507151?v=4?s=100" width="100px;" alt="Neil Chue Hong"/><br /><sub><b>Neil Chue Hong</b></sub></a><br /><a href="#content-npch" title="Content">🖋</a> <a href="#research-npch" title="Research">🔬</a> <a href="#ideas-npch" title="Ideas, Planning, & Feedback">🤔</a></td>
4242
<td align="center" valign="top" width="14.28%"><a href="https://hui-ling-wong.com/"><img src="https://avatars.githubusercontent.com/u/71387295?v=4?s=100" width="100px;" alt="Hui Ling Wong"/><br /><sub><b>Hui Ling Wong</b></sub></a><br /><a href="#ideas-wong-hl" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-wong-hl" title="Research">🔬</a></td>
4343
<td align="center" valign="top" width="14.28%"><a href="https://colinsauze.github.io/"><img src="https://avatars.githubusercontent.com/u/1053628?v=4?s=100" width="100px;" alt="Colin Sauze"/><br /><sub><b>Colin Sauze</b></sub></a><br /><a href="#ideas-colinsauze" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-colinsauze" title="Research">🔬</a></td>
4444
<td align="center" valign="top" width="14.28%"><a href="http://sfmig.github.io"><img src="https://avatars.githubusercontent.com/u/33267254?v=4?s=100" width="100px;" alt="sfmig"/><br /><sub><b>sfmig</b></sub></a><br /><a href="#ideas-sfmig" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-sfmig" title="Research">🔬</a> <a href="#content-sfmig" title="Content">🖋</a></td>

docs/_data/terms.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22

33
- term: "Software"
44
definition: "Written steps to control a computer wrapped together"
5-
description: ""
5+
description: "Steps that tell a computer what to do and how to do it. Includes all the sets of steps a computer uses, like the main set of steps that runs the computer and other sets of steps people use to do different jobs."
66

77
- term: "Research (process)"
88
definition: "A way to understand and look for new facts"
9-
description: ""
9+
description: "A planned way of looking into something to find out new things, check if ideas are right, or learn more about it. It means getting facts, writing them down, and working through them so they can help people know what to do. This kind of work can be done to learn new ideas, or to help fix real problems in the world."
1010

1111
- term: "Research (findings)"
1212
definition: "Piece of work sharing new facts made from ways to understand"
1313
description: "Piece of work sharing new facts made from ways to understand the world"
1414

1515
- term: "Scientist"
1616
definition: "Someone who looks at the world around them and asks questions like, why is it the way it is or how does it work"
17-
description: ""
17+
description: "Person who's job is to find out new things. They get facts and other things to help them come up with ideas and learn more about one part of the world, like living things, what things are made of, or how things move. They work to understand the world around us, fix problems, and tell other people what they find so everyone can know more."
1818

1919
- term: "Data"
2020
definition: "Numbers and words that can be used to answer questions"
2121
description: "Pieces of things like numbers, words, pictures, or sounds. People work on these pieces to sort them and give them clear ideas, decide things and fix problems."
2222

2323
- term: "University"
2424
definition: "School for students and teachers to learn how to understand and look for new facts"
25-
description: ""
25+
description: "A place where people go after school to learn more and find out new things. It has parts for people who are just starting and parts for people who have gone further. There are teachers and people work to find out new things."
2626

2727
- term: "Community"
2828
definition: "Group of people who have a shared interest or want or have something the same"
29-
description: ""
29+
description: "A group of people who share things like where they live, what they like, or who they are. They often know each other, help each other, and feel like they are part of the same group."
3030

3131
- term: "Collaborations Workshop"
3232
definition: "Lots of different people working together meeting"

0 commit comments

Comments
 (0)