tatianamac 
							
						 
					 
					
						
						
							
						
						48c572b8d6 
					 
					
						
						
							
							Merge branch 'siawayforward-define-neo-colonialism' into prod  
						
						
						
						
					 
					
						2020-11-16 17:00:31 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						31aa6f3dd5 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:58:40 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						5172d00d91 
					 
					
						
						
							
							added definition and references for neo-colonialism  
						
						
						
						
					 
					
						2020-11-16 16:58:33 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						0a870e8abf 
					 
					
						
						
							
							split neo-colonialism for a different definition  
						
						
						
						
					 
					
						2020-11-16 16:58:19 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						a50a9bded9 
					 
					
						
						
							
							updated slave trade descriptor  
						
						
						
						
					 
					
						2020-11-16 16:57:46 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						f744ec901b 
					 
					
						
						
							
							Update 11ty/definitions/colonialism.md  
						
						... 
						
						
						
						changed from American to British spelling of coloni"*"ers
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:57:45 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						fec298c9ca 
					 
					
						
						
							
							Update 11ty/definitions/colonialism.md  
						
						... 
						
						
						
						similar terms updated. resolved
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:57:45 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						32c87dd6b5 
					 
					
						
						
							
							Update 11ty/definitions/colonialism.md  
						
						... 
						
						
						
						review resolved!
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:57:00 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						dadaaed048 
					 
					
						
						
							
							removed target blank indicator  
						
						
						
						
					 
					
						2020-11-16 16:57:00 -08:00 
						 
				 
			
				
					
						
							
							
								tatianamac 
							
						 
					 
					
						
						
							
						
						b4aca04d45 
					 
					
						
						
							
							Merge branch 'siawayforward-define-neo-colonialism' into prod  
						
						
						
						
					 
					
						2020-11-16 16:39:14 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						b24f069d41 
					 
					
						
						
							
							updated suggested edits  
						
						
						
						
					 
					
						2020-11-16 16:38:31 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						40d07d7177 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:38:24 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						f842133411 
					 
					
						
						
							
							split neo-colonialism for a different definition  
						
						
						
						
					 
					
						2020-11-16 16:36:14 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						2a7651f2bd 
					 
					
						
						
							
							Update 11ty/definitions/colonialism.md  
						
						... 
						
						
						
						similar terms updated. resolved
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:35:46 -08:00 
						 
				 
			
				
					
						
							
							
								tatianamac 
							
						 
					 
					
						
						
							
						
						c4794d3022 
					 
					
						
						
							
							Merge branch 'siawayforward-define-neo-colonialism' into prod  
						
						
						
						
					 
					
						2020-11-16 16:29:47 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						4a4e474c38 
					 
					
						
						
							
							updated suggested edits  
						
						
						
						
					 
					
						2020-11-16 16:28:12 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						606e5dae96 
					 
					
						
						
							
							delete colonialism.md to keep PRs straight  
						
						
						
						
					 
					
						2020-11-16 16:28:12 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						f67bcb16d7 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:27:52 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						57824cea36 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:27:52 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						da56e606b5 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:27:52 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						050bd9c3ac 
					 
					
						
						
							
							Update 11ty/definitions/neo-colonialism.md  
						
						... 
						
						
						
						Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:27:51 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						4b8a59b429 
					 
					
						
						
							
							added definition and references for neo-colonialism  
						
						
						
						
					 
					
						2020-11-16 16:27:51 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						ffd8e63686 
					 
					
						
						
							
							split neo-colonialism for a different definition  
						
						
						
						
					 
					
						2020-11-16 16:27:51 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						5738b4c5f4 
					 
					
						
						
							
							Update 11ty/definitions/colonialism.md  
						
						... 
						
						
						
						similar terms updated. resolved
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-16 16:27:06 -08:00 
						 
				 
			
				
					
						
							
							
								Tatiana Mac 
							
						 
					 
					
						
						
							
						
						2a26b4b361 
					 
					
						
						
							
							✏️  Update language ( #370 )  
						
						
						
						
					 
					
						2020-11-11 13:59:43 -08:00 
						 
				 
			
				
					
						
							
							
								Sia 
							
						 
					 
					
						
						
							
						
						1ae1c42be2 
					 
					
						
						
							
							➕  Adds definition for colonialism ( #343 )  
						
						... 
						
						
						
						* add definition for colonialism
* removed target blank indicator
* Update 11ty/definitions/colonialism.md
review resolved!
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/colonialism.md
similar terms updated. resolved
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/colonialism.md
changed from American to British spelling of coloni"*"ers
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/colonialism.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/colonialism.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* updated slave trade descriptor
* split neo-colonialism for a different definition
* updated indentation
Co-authored-by: Tatiana Mac <github@tatianamac.com >
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-11 13:44:29 -08:00 
						 
				 
			
				
					
						
							
							
								Kelsey Huse 
							
						 
					 
					
						
						
							
						
						7531425ee3 
					 
					
						
						
							
							➕  Defines "grandfathered in" ( #341 )  
						
						... 
						
						
						
						* add definition for grandfathered in
* Update 11ty/definitions/grandfathered-in.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/grandfathered-in.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/grandfathered-in.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* update filename to grandfathering
* update usage tips
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-11-06 16:02:51 -08:00 
						 
				 
			
				
					
						
							
							
								Goncalo Pereira 
							
						 
					 
					
						
						
							
						
						6f31e98e7d 
					 
					
						
						
							
							🌐  [pt_PT] Translates capatismo, cisgenero, transgenero  #279   ( #350 )  
						
						... 
						
						
						
						* ableism pt_PT
* pt_PT cisgender
* transgender pt_PT
* Update capacitismo.md
Remove aptidismo
* Update capacitismo.md
Na
* Update cisgenero.md
É
* Update transgenero.md
Cisgénero
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-10-23 10:36:41 -07:00 
						 
				 
			
				
					
						
							
							
								Erin Borders 
							
						 
					 
					
						
						
							
						
						47310a2901 
					 
					
						
						
							
							+ Defines "food desert" ( #353 )  
						
						... 
						
						
						
						* definition for a food desert
* add end of line character
* Update 11ty/definitions/food-desert.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/food-desert.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/food-desert.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/food-desert.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
* Update 11ty/definitions/food-desert.md
Co-authored-by: Tatiana Mac <github@tatianamac.com >
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-10-20 13:44:15 -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 
						 
				 
			
				
					
						
							
							
								F 
							
						 
					 
					
						
						
							
						
						93a7c44950 
					 
					
						
						
							
							🎨  Style uls like ps when they're direct content ( #347 )  
						
						... 
						
						
						
						Without this change, `ul`s get compressed to a single grid column if they're direct children of `.definition-content__content`.
Co-authored-by: Tatiana Mac <github@tatianamac.com > 
						
						
					 
					
						2020-10-07 17:15:35 -07:00 
						 
				 
			
				
					
						
							
							
								Vanessa Aguilar 
							
						 
					 
					
						
						
							
						
						ffe7437056 
					 
					
						
						
							
							🔗  Replace expired Slack link with updated link ( #344 )  
						
						
						
						
					 
					
						2020-10-07 15:33: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 
						 
				 
			
				
					
						
							
							
								kittensyzygy 
							
						 
					 
					
						
						
							
						
						4082efa1e3 
					 
					
						
						
							
							🔗  Fixing three links ( #323 )  
						
						... 
						
						
						
						Each inline link had the sentence full-stop/period within the URL markdown, stopping the links from opening. Move full-stops to the end of the sentence, outside of the link markdown. 
						
						
					 
					
						2020-10-06 12:37:40 -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