547 Commits

Author SHA1 Message Date
tatianamac
2accde1a0e Updates heading levels 2020-11-16 18:03:55 -08:00
tatianamac
6f7cc99585 Updates excerpt 2020-11-16 17:26:44 -08:00
tatianamac
88437f3f11 adds back colonialism 2020-11-16 17:24:53 -08:00
tatianamac
13584ade43 Merge branch 'siawayforward-define-neo-colonialism' into prod 2020-11-16 17:16:16 -08:00
tatianamac
e998fcae8b Removes colonialism 2020-11-16 17:15:42 -08:00
tatianamac
3f72388f6e Resolve unresolved head 2020-11-16 17:11:18 -08:00
tatianamac
f1889cf6f4 Resolves markdown issues 2020-11-16 17:02:23 -08:00
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
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
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
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