mafoo.org.uk/selfdefined
1
0
Fork 0
mirror of https://github.com/fooflington/selfdefined.git synced 2025-11-02 06:49:03 +00:00
Code Issues Projects Releases Wiki Activity
511 Commits 7 Branches 0 Tags
a97d39e01190c5af53479748d22f5b96e58cd36f
Commit Graph

177 Commits

Author SHA1 Message Date
Sia
a97d39e011 Merge branch 'define-neo-colonialism' of https://github.com/siawayforward/self-defined-web-app into define-neo-colonialism 2020-11-11 21:17:40 -08:00
Sia
d76218f914 updated suggested edits 2020-11-11 21:14:32 -08:00
Sia
a366464739 delete colonialism.md to keep PRs straight 2020-11-11 21:13:03 -08:00
Sia
68fa95ee7d Update 11ty/definitions/neo-colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-11-11 20:34:14 -08:00
Sia
73aba1fd8e Update 11ty/definitions/neo-colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-11-11 20:32:17 -08:00
Sia
4002653df1 Update 11ty/definitions/neo-colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-11-11 20:31:35 -08:00
Sia
f376373668 Update 11ty/definitions/neo-colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-11-11 20:31:04 -08:00
Sia
37cb3d3de4 added definition and references for neo-colonialism 2020-10-15 16:12:36 -07:00
Sia
a3d86ec0d9 split neo-colonialism for a different definition 2020-10-15 16:00:48 -07:00
Sia
1ce5e45460 updated slave trade descriptor 2020-10-15 16:00:48 -07:00
Sia
ec16fa7446 Update 11ty/definitions/colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-15 16:00:48 -07:00
Sia
fd23c5ed2b Update 11ty/definitions/colonialism.md 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-15 16:00:47 -07:00
Sia
115c4851ae Update 11ty/definitions/colonialism.md 
changed from American to British spelling of coloni"*"ers

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-15 16:00:47 -07:00
Sia
45216ac72b Update 11ty/definitions/colonialism.md 
similar terms updated. resolved

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-15 16:00:46 -07:00
Sia
053bb6941c Update 11ty/definitions/colonialism.md 
review resolved!

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-15 16:00:46 -07:00
Sia
fe3ab7c6e3 removed target blank indicator 2020-10-15 16:00:46 -07:00
Sia
613af44669 add definition for colonialism 2020-10-15 16:00:45 -07:00
John Breen
a3483d8485 🔗 Rename ADD/ADHD file to match slug (#354) 
This should fix the 404 errors for https://www.selfdefined.app/definitions/add-adhd/
 2020-10-15 12:13:00 -07:00
kittensyzygy
2e79737b70 ✏️ Added missing closing parenthesis (#331) 
Plus tweaked punctuation.

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 19:26:22 -07:00
John Breen
1730c1d857 ➕ Create definition for ADHD (#260) 
* Create adhd.md

* Add other ADHD traits

Added sections for executive dysfunction, working memory, emotional dysregulation, and distractibility.

* Fixed Markdown Lint issues

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 19:08:08 -07:00
Rahul
26855bb0ec ✏️ Fix typo (#330) 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 19:07:14 -07:00
kittensyzygy
0818bfbba2 ✏️ Grammar fix on Master Slave (#327) 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 19:03:03 -07:00
kittensyzygy
0b72988559 ✏️ Typo fix (#333) 
Changed "majority" to "minority" in Read also section

Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 18:58:07 -07:00
kittensyzygy
17d4373a6e 🔗 Fixing link to "underrepresented minority" (#324) 
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-10-06 18:54:47 -07:00
Tatiana Mac
573a4e2883 ✏️ Edits bi-erasure (#314) 
* Revises bi-erasure definition

* Edits bi-erasure
 2020-09-02 18:06:29 -07:00
Jonathan Silvestri
b59ddee9b3 ➕ Adds definition for nerd (#267) 
* Definition for nerd

* Update 11ty/definitions/nerd.md

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Adds page for blerd. Adds 'taking it back' section. Adds reference to blerd page

* Update 11ty/definitions/blerd.md

Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>

* Update 11ty/definitions/nerd.md

Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>

* Update 11ty/definitions/nerd.md

Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>

* Update 11ty/definitions/nerd.md

Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>

* Update 11ty/definitions/nerd.md

Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>

* Move Self-identification before Issues

* Passionate => passion

Co-authored-by: Tatiana Mac <github@tatianamac.com>
Co-authored-by: Tatiana Mac <7484549+tatianamac@users.noreply.github.com>
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 14:00:27 -07:00
Cale Sennett
6a4a71ee40 ➕ Add definition of junkie (#266) 
* add definition of junkie

* update language and syntax

Co-authored-by: Tatiana Mac <github@tatianamac.com>

Co-authored-by: Tatiana Mac <github@tatianamac.com>
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:48:40 -07:00
Carlito
10d3a98ba5 🌐 Link existing EN and FR definitions (#295) 
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:40:46 -07:00
Carlito
314676711e 🌐 Add French definition for "women and people of colour" (#297) 
* 🇫🇷 Add French definition for "women and people of colour"

* ✏️ Add link to "non-binary" French definition

* ✏️ Fix broken link

* ✏️ Minor change

* ✏️ Correct typo

* ✏️ Add reading resources

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:30:58 -07:00
Carlito
0838fdc43b 🌐 Add French definition for "unreal" (#298) 
* 🇫🇷 Add French definition for "unreal"

* ✏️ Correct typos

* ✏️ Lowercase title

* ✏️ Add reading resources

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:22:38 -07:00
Carlito
8eceb7e80c 🌐 Add French definition for "gender pronouns" (#296) 
* 🇫🇷 Add French definition for "gender pronouns"

* ✏️ Correct translation error

* ✏️ Correct some more translation errors

* ✏️Lowercase title

* ✏️ Add reading resources

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:18:44 -07:00
Carlito
3d7bc84e12 🌐 Add French definition for "transgender" (#299) 
* 🇫🇷 Add French definition for "transgender"

* ✏️ Link existing "cisgender" French translation

* ✏️ Fix translation typo

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:16:59 -07:00
Carlito
92683409d3 🌐 Add French definition for "pansexual" (#300) 
* 🇫🇷 Add French definition for "pansexual"

* ✏️ Lowercase titles

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:07:30 -07:00
Carlito
cdf3c2b602 🌐 Add French definition for "non-binary" (#301) 
* 🇫🇷 Add French definition for "non-binary"

* ✏️ Use less complex phrasing

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:04:34 -07:00
Carlito
1552248752 🌐 Add French definition for "monoculture" (#302) 
* 🇫🇷 Add French definition for "monoculture"

* ✏️ Minor change

* ✏️ Correct typo

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 13:00:54 -07:00
Carlito
f50ceb5dce 🌐 Add French definition for "bisexual" (#303) 
* 🇫🇷 Add French definition for "bisexual"

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 12:57:06 -07:00
Carlito
e9f03cfdd4 🌐 Add French definition for "transfeminine" (#304) 
* 🇫🇷 Add French definition for "transfeminine"

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 12:53:45 -07:00
Carlito
f594a1ddb0 🌐 Add French definition for "biromantic" (#305) 
* 🇫🇷 Add French definition for "biromantic"

* ✏️ Minor change

* ✏️ Lowercase title

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-09-02 12:45:07 -07:00
Carlito
2a86fb2b55 🌐 Add French definition for "plural" (#306) 
* 🇫🇷 Add French definition for "plural"

* ✏️ Correct phrasing

* ✏️ Lowercase title

* 🐛 Resolves build error

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
Co-authored-by: Tatiana Mac <github@tatianamac.com>
 2020-09-02 12:42:17 -07:00
Carlito
ac1649a244 🌐 Add French definition for "dissociative identity disorder" (#307) 
* 🇫🇷 Add French definition for "dissociative identity disorder"

* ➕ Add other used terms

* ✏️ Lowercase titles

* ✏️ Add reading resource

* ✏️ Remove extra space before "Read more" section
 2020-09-02 12:36:57 -07:00
Oak Thielbar
845db8cb02 ✏️ Add attribution to ableism excerpt (#291) 
* Added attribution to ableism definiton excerpt

* Fixed typo in name of quoted auther in ableism definition

Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-29 17:39:05 -07:00
Oak Thielbar
e31b5212c6 ✏️ Adds an additional sentence from the body of the definition of barbaric to provide context on its harm (#293) 2020-08-29 17:21:04 -07:00
Joyce Kung
2c9f1a3f3d :writing Add excerpts for currently defined words (#262) 
* Added excerpt for ok-hand

* Added excerpt for AsAm

* Added excerpt for East Asian

* Added excerpt for South Asian

* Added excerpt for SE Asian

* Added excerpt for bierasure

* Added excerpt for biromantic

* Added excerpt for bisexual

* Added excerpt for cisgender

* Added excerpt for crazy

* Add excerpt for dumb

* Add excerpt for derpy

* Add excerpt for digital blackface

* Add excerpt for dude

* Add excerpt for ESL

* Add excerpt for fatphobia

* Add excerpt for gaslighting

* Add excerpt for gender pronouns

* Add excerpt for Hispanic

* Add excerpt for hysterical

* Add excerpt for latino

* Add excerpt for latinx

* Add excerpt for mansplain

* Add excerpt for minorities

* Add excerpt for minoritised

* Add excerpt for neopronouns

* Add excerpt for non-binary

* Add excerpt for OCD

* Add excerpt for Oriental

* Add excerpt for ORM

* Add excerpt for pansexual

* Add excerpt for performative allyship

* Add excerpt for polyamory

* Add excerpt for pow-wow

* Add excerpt for preferred pronouns

* Add excerpt for pronouns

* Add excerpt for r-word

* Add excerpt for sane

* Add excerpt for sanity check

* Add excerpt for savage

* Add excerpt for spaz

* Add excerpt for suicide

* Add excerpt for tone deaf

* Add excerpt for transfeminine

* Add excerpt for URM

* Add excerpt for unreal

* Add excerpt for white feminism

* Add excerpt for white fragility

* Add excerpt for women and people of colour

* Add excerpt for transgender

* Fix spelling for "existence"

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Fix wording for digital blackface excerpt

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Add indicators for flag levels

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Revert "Add indicators for flag levels"

This reverts commit a291d5fa668156970e2496710bd6c39a53819e1b, because the flag level is already indicated in the excerpt structure.

Co-authored-by: Oscar <ovlb@users.noreply.github.com>
Co-authored-by: Tatiana Mac <github@tatianamac.com>
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-29 15:45:29 -07:00
Simeon Smith
4ce8bf2a16 🐛 Changes psychopath flat type to be a text key instead (#287) 
Co-authored-by: Simeon Smith <simeon@uxiliary.com>
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-29 15:04:51 -07:00
shomveerKherwa
f637011c5f Update dude.md (#284) 
Typo in dude entry #277
 2020-08-28 17:08:08 +02:00
Eveline Xie
bf8db29a2c ➕ Defines monoculture (#272) 
* Define Monoculture

* Update 11ty/definitions/monoculture.md

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Update _util/undefined-words.json

Co-authored-by: Tatiana Mac <github@tatianamac.com>

* Update 11ty/definitions/monoculture.md

Co-authored-by: Tatiana Mac <github@tatianamac.com>

Co-authored-by: Tatiana Mac <github@tatianamac.com>
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-27 15:50:19 -07:00
Andrew Aquino
e6d4edda8c ✏️ Fix typo on dude (modal -> model) (#281) 2020-08-26 09:52:31 -07:00
Simran
7f11b552a6 ➕ Add "basic" as alternative for "dumb" (#264) 
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-25 18:28:40 -07:00
Simran
acc2fff163 ➕ Add plausibility check as alt word for sanity check (#256) 
Co-authored-by: Tatiana Mac <tatiana.t.mac@gmail.com>
 2020-08-25 18:16:56 -07:00
ellenmacpherson
cc3bc675bd ✏️ Changes spelling of antisemitism (#276) 2020-08-25 16:27:03 -07:00