Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General housekeeping - Rename, Relocate & Remove Parrots #350

Merged
merged 20 commits into from
Mar 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,9 @@ __pycache__/
*.py[cod]
*$py.class
.ropeproject

# VS Code
.vscode

# Chromedriver
Chromedriver.exe
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ The only Slack reaction gif's you'll ever need.
* [@zix99](https://github.com/zix99) for [ceiling parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/186)
* [@PretzelCA](https://github.com/PretzelCA) for [Discord bot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/187)
* [@matthewjwolff](https://github.com/matthewjwolff) for [mardi gras parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/194)
* [@Darth-Arminius](https://github.com/Darth-Arminius) for [sith parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/198)
* [@Darth-Arminius](https://github.com/Darth-Arminius) for [sith parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/198) and various housekeeping contributions
* [@emmajam](https://github.com/emmajam) for [bitcoin parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/201)
* [@juniormucciolo](https://github.com/juniormucciolo) for [portal parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/203)
* [@mrkolby](https://github.com/mrkolby) for [flying money parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/208), [hard hat parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/206), [troll parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/207), [mustache parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/204), [bunny parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/216) and [Norwegian Blue parrot](https://github.com/jmhobbs/cultofthepartyparrot.com/issues/218)
Expand All @@ -136,6 +136,7 @@ The only Slack reaction gif's you'll ever need.
# Contributing!

1. Add your parrot gif to `parrots/` and append an entry to `parrots.json`
1. Make sure your parrot gif file is named [name]parrot.gif in all lower case e.g. `exampleparrot.gif`
1. Open a PR
1. PARTY

Expand Down
79 changes: 36 additions & 43 deletions parrots.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"name": "Middle Parrot"
},
{
"gif": "rightparrot.gif",
"hd": "hd/rightparrot.gif",
"name": "Right Parrot"
"gif": "reverseparrot.gif",
"hd": "hd/reverseparrot.gif",
"name": "Reverse Parrot"
},
{
"gif": "aussieparrot.gif",
Expand Down Expand Up @@ -69,9 +69,9 @@
"tip": "Parrots are entitled to their full range of emotions."
},
{
"gif": "parrotcop.gif",
"hd": "hd/parrotcop.gif",
"name": "Parrot Cop",
"gif": "copparrot.gif",
"hd": "hd/copparrot.gif",
"name": "Cop Parrot",
"tip": "Not to be confused with Stripper Parrot!"
},
{
Expand All @@ -98,8 +98,8 @@
"tip": "Party in slow motion."
},
{
"gif": "parrotdad.gif",
"name": "Parrot Dad",
"hd": "hd/dadparrot.gif",
"name": "Dad Parrot",
"tip": "Is totally freaking out."
},
{
Expand Down Expand Up @@ -141,8 +141,8 @@
"name": "Shuffle Party Parrot"
},
{
"gif": "ice-cream-parrot.gif",
"name": "Ice Cream Parrot"
"gif": "icecreamparrot.gif",
"name": "Ice-Cream Parrot"
},
{
"gif": "sassyparrot.gif",
Expand All @@ -165,39 +165,39 @@
"name": "Aussie Reverse Conga Line Parrot"
},
{
"gif": "parrotwave1.gif",
"gif": "wave1parrot.gif",
"name": "Parrot Wave (1)"
},
{
"gif": "parrotwave2.gif",
"gif": "wave2parrot.gif",
"name": "Parrot Wave (2)"
},
{
"gif": "parrotwave3.gif",
"gif": "wave3parrot.gif",
"name": "Parrot Wave (3)"
},
{
"gif": "parrotwave4.gif",
"gif": "wave4parrot.gif",
"name": "Parrot Wave (4)"
},
{
"gif": "parrotwave5.gif",
"gif": "wave5parrot.gif",
"name": "Parrot Wave (5)"
},
{
"gif": "parrotwave6.gif",
"gif": "wave6parrot.gif",
"name": "Parrot Wave (6)"
},
{
"gif": "parrotwave7.gif",
"gif": "wave7parrot.gif",
"name": "Parrot Wave (7)"
},
{
"gif": "parrotwave8.gif",
"gif": "wave8parrot.gif",
"name": "Parrot Wave (8)"
},
{
"gif": "parrotwave9.gif",
"gif": "wave9parrot.gif",
"name": "Parrot Wave (9)"
},
{
Expand All @@ -220,8 +220,8 @@
"name": "Coffee Parrot"
},
{
"gif": "parrotmustache.gif",
"hd": "hd/parrotmustache.gif",
"gif": "mustacheparrot.gif",
"hd": "hd/mustacheparrot.gif",
"name": "Parrot with mustache"
},
{
Expand All @@ -230,13 +230,13 @@
"name": "Christmas Parrot"
},
{
"gif": "parrotsleep.gif",
"gif": "sleepingparrot.gif",
"hd": "hd/sleepingparrot.gif",
"name": "Sleepy Parrot"
},
{
"gif": "parrotbeer.gif",
"hd": "hd/parrotbeer.gif",
"gif": "beerparrot.gif",
"hd": "hd/beerparrot.gif",
"name": "Happy Hour Parrot"
},
{
Expand Down Expand Up @@ -273,8 +273,8 @@
"tip": "You're a parrot-wizard Harry!"
},
{
"gif": "upvotepartyparrot.gif",
"name": "Upvote Party Parrot"
"gif": "upvoteparrot.gif",
"name": "Upvote Parrot"
},
{
"gif": "twinsparrot.gif",
Expand Down Expand Up @@ -323,7 +323,7 @@
"name": "Donut Parrot"
},
{
"gif": "evilparrot.gif",
"hd": "hd/evilparrot.gif",
"name": "Evil Parrot"
},
{
Expand Down Expand Up @@ -395,7 +395,7 @@
"name": "Angry Parrot"
},
{
"gif": "invisibleparrot.gif",
"hd": "hd/invisibleparrot.gif",
"name": "Invisible Parrot"
},
{
Expand Down Expand Up @@ -463,12 +463,10 @@
"tip": "The money is flying away!"
},
{
"gif": "portalorangeparrot.gif",
"hd": "hd/portalorangeparrot.gif",
"name": "Portal Parrot (Orange Portal)"
},
{
"gif": "portalblueparrot.gif",
"hd": "hd/portalblueparrot.gif",
"name": "Portal Parrot (Blue Portal)"
},
Expand All @@ -491,15 +489,15 @@
"name": "Fix Parrot"
},
{
"gif": "brazilianplayerparrot.gif",
"hd": "hd/brazilianplayerparrot.gif",
"name": "Brazilian Player Parrot"
},
{
"gif": "brazilianfanparrot.gif",
"hd": "hd/brazilianfanparrot.gif",
"name": "Brazilian Fan Parrot"
},
{
"gif": "spyparrot.gif",
"hd": "hd/spyparrot.gif",
"name": "Spy Parrot"
},
{
Expand All @@ -515,17 +513,12 @@
"name": "Calvinist Parrot"
},
{
"hd": "hd/britparrot.gif",
"name": "British Parrot"
"gif":"frenchparrot.gif",
"hd":"hd/frenchparrot.gif",
"name":"French Parrot",
"tip":"Oulala"
},
{
"gif":"frenchparrot.gif",
"hd":"hd/frenchparrothd.gif",
"name":"French Parrot",
"tip":"Oulala"
},
{
"gif": "githubparrot.gif",
"hd": "hd/githubparrot.gif",
"name": "Github Party Parrot",
"tip": "Github PR Party"
Expand Down Expand Up @@ -567,7 +560,7 @@
"name": "Football Parrot"
},
{
"hd": "hd/flower_parrot.gif",
"hd": "hd/flowerparrot.gif",
"name": "Flower Parrot"
},
{
Expand Down
File renamed without changes
File renamed without changes
Binary file removed parrots/githubparrot.gif
Binary file not shown.
File renamed without changes
File renamed without changes
Binary file removed parrots/hd/britparrot.gif
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed parrots/portalblueparrot.gif
Binary file not shown.
Binary file removed parrots/portalorangeparrot.gif
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
1 change: 1 addition & 0 deletions templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ The only Slack reaction gif's you'll ever need.
# Contributing!

1. Add your parrot gif to `parrots/` and append an entry to `parrots.json`
1. Make sure your parrot gif file is named [name]parrot.gif in all lower case e.g. `exampleparrot.gif`
1. Open a PR
1. PARTY

Expand Down