Skip to content
New issue

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

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

Already on GitHub? # to your account

Added a bunch of quotes #3103

Merged
merged 12 commits into from
Jun 16, 2022
Merged

Added a bunch of quotes #3103

merged 12 commits into from
Jun 16, 2022

Conversation

holyhearted
Copy link
Contributor

Description

Added 5 new quotes to English quote .json

Closes #

@github-actions github-actions bot added assets Languages, themes, layouts, etc. frontend User interface or web stuff labels Jun 10, 2022
@github-actions
Copy link
Contributor

The PR check action failed. Please review the logs and make the necessary changes. https://github.com/monkeytypegame/monkeytype/actions/runs/2476462715

@Bruception
Copy link
Member

Please fix quote lengths

@Bruception Bruception added the waiting for update Pull requests or issues that require changes/comments before continuing label Jun 10, 2022
@holyhearted
Copy link
Contributor Author

fixed

@holyhearted holyhearted changed the title Added 5 quotes Added a bunch of quotes Jun 12, 2022
@Bruception
Copy link
Member

Merge conflicts

holyhearted and others added 4 commits June 12, 2022 16:16
* extended: language 'code rust' (#3104)

Added all derives and some very common traits as well as `pub(crate)`.

* added one english quote (#3094)

* added one english quote

* added one english quote

* updated the quote id 6095

* Custom Filters [Backend] (#3105)

* Added `ResultFilters` to types
Added customFilters field to user
This field is an optional array of `ResultFilters`
It will store a user's custom filters

* Added Add and Remove functions for `ResultFilters` in user DAL

Also added unit tests

* Added Custom Filter configuration

Can now enable/disable the custom filters feature
Can also set a cap on the number of filters per user

* Add and Remove functions for `ResultFilters` in user controller

* Added one english quote (#3109)

* added one english quote

* added one english quote

* updated the quote id 6095

* Added english quote id 6096

* Custom Filters [Backend] (#3105) (#3110)

* Added `ResultFilters` to types
Added customFilters field to user
This field is an optional array of `ResultFilters`
It will store a user's custom filters

* Added Add and Remove functions for `ResultFilters` in user DAL

Also added unit tests

* Added Custom Filter configuration

Can now enable/disable the custom filters feature
Can also set a cap on the number of filters per user

* Add and Remove functions for `ResultFilters` in user controller

* Added Haskell programming language (#3108)

* added: code_haskell language;

* fixed: missing comma;

* Contributing typos fix (#3114)

* spacebar in presets and tags addition

* super mega spacebar remake

* style fix

* final name removal in ui

* replaceAll in ape removal

* using display above account chart

* create preset in command line addition

* testing removal

* one more testing removal

* create tag command line addition

* Update commandline-lists.ts

* moved add commands to the bottom
hiding if user is not signed in

* refactor

* hiding tags and presets when signed out

* fixed presets and tags display in alerts

* russian_25k and russian_50k addition

* russian 375k addition

* lil fix

* fixed windows auto-reload error

* Revert "fixed windows auto-reload error"

This reverts commit ea22621.

* Revert "Revert "fixed windows auto-reload error""

This reverts commit 669cec4.

* Revert "Revert "Revert "fixed windows auto-reload error"""

This reverts commit d903526.

* themes popup small fix

* using &&

* some typos fixed

Co-authored-by: Miodec <bartnikjack@gmail.com>
Co-authored-by: Vasiliy Novozhilov <vasya@192.168.1.3>

* Fix yesterday toggle button (#3107)

Co-authored-by: Cody Bloemhard <cblmhrd@live.nl>
Co-authored-by: Jitesh Kumar Sahoo <77315098+Jitesh117@users.noreply.github.com>
Co-authored-by: Malo Hamon <hamon.malo@gmail.com>
Co-authored-by: aNOOBis <69043738+aNOOBisTheGod@users.noreply.github.com>
Co-authored-by: Miodec <bartnikjack@gmail.com>
Co-authored-by: Vasiliy Novozhilov <vasya@192.168.1.3>
Co-authored-by: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
@holyhearted
Copy link
Contributor Author

done(?) i’m horrible at using git

@github-actions
Copy link
Contributor

The PR check action failed. Please review the logs and make the necessary changes. https://github.com/monkeytypegame/monkeytype/actions/runs/2484126125

@Bruception
Copy link
Member

Invalid quote IDs

@github-actions
Copy link
Contributor

The PR check action failed. Please review the logs and make the necessary changes. https://github.com/monkeytypegame/monkeytype/actions/runs/2505222847

@holyhearted
Copy link
Contributor Author

IDs should be proper now, added a few more quotes also

@github-actions
Copy link
Contributor

The PR check action failed. Please review the logs and make the necessary changes. https://github.com/monkeytypegame/monkeytype/actions/runs/2505331154

Copy link
Member

@Bruception Bruception left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Bruception Bruception merged commit e6712e9 into monkeytypegame:master Jun 16, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
assets Languages, themes, layouts, etc. frontend User interface or web stuff waiting for update Pull requests or issues that require changes/comments before continuing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants