about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-02-01Fix hashtag processing when sending tootsThibaut Girka
This fixes crashes in pleroma when writing toots with a content warning, since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
2019-01-27[Glitch] Fix initial value of volume slider in video player and handle ↵Thibaut Girka
volume changes Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc
2019-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-27Fix initial value of volume slider in video player and handle volume changes ↵ThibG
(#9929) * Fix initial value of volume slider in video player and handle volume changes * Clean up dead/incorrect code
2019-01-27Implement missing hotkeys for notifications (#9927)ThibG
2019-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-27Revert to storing application info, and display it to the author via APIThibaut Girka
2019-01-27Make storing and displaying application used to toot opt-inThibaut Girka
2019-01-26Prevent posting toots with media attachments from someone else (#9921)ThibG
2019-01-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-25Fix SSO authentication not working due to missing agreement boolean (#9915)Eugen Rochko
Fix #9906
2019-01-25Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-25Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-24Rescue SSL error in verify link service (#9914)Renato "Lond" Cerqueira
If the first link to be verified contains a rel=me link with a SSL error, the VerifyAccountLinksWorker will fail and not try the following links. This rescues the SSL error when fetching the link, avoiding this issue.
2019-01-24Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-23Fix crash in Direct Messages column settingsThibaut Girka
Fixes #892
2019-01-21Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-21Fix scheduled toot with media immediately creating a toot (#9894)ThibG
* Add test for not persisting status when attaching media to scheduled toot * Prevent status used for validation from being persisted to the database Fixes #9893 Thanks to tateisu for the help investigating this.
2019-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-20Fix multiple workers for the same scheduled status being queueable (#9875)Eugen Rochko
2019-01-20Fix directory showing tags that have no currently eligible accounts (#9872)Eugen Rochko
2019-01-20i18n: Update Japanese translations (#9871)mayaeh
* Update Japanese translations. * Delete unused translation.
2019-01-20[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width ↵Thibaut Girka
compensation Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
2019-01-20[Glitch] Hide floating action button on search and getting started pagesThibaut Girka
Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc
2019-01-20Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-20[Glitch] Fix new hashtag page's items not being full-width on mobileThibaut Girka
Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc
2019-01-20[Glitch] Add information about how to opt-in to the directory on the directoryThibaut Girka
Port SCSS changes from a492a9bcd355d4f0998990905177ac4f9699cc3c to glitch-soc
2019-01-20Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-20[Glitch] Improve the public hashtag pageThibaut Girka
Port 8b1990355974543542544e56d2046bc0c9c8716b to glitch-soc
2019-01-20[Glitch] Redesign public hashtag page to use a masonry layoutThibaut Girka
Port bc642ac24b49c14dca382e7aabbc16130293d2f4 to glitch flavour
2019-01-19Weblate translations (2019-01-19) (#9867)Eugen Rochko
* Translated using Weblate (Serbian) Currently translated at 85.0% (91 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 86.9% (93 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 93.6% (707 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (French) Currently translated at 99.1% (748 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Galician) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Arabic) Currently translated at 98.9% (352 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (French) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Arabic) Currently translated at 92.6% (699 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 94.7% (715 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Dutch) Currently translated at 99.5% (751 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Serbian) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ * Translated using Weblate (Serbian) Currently translated at 95.6% (722 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Arabic) Currently translated at 97.2% (104 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Latvian) Currently translated at 16.9% (60 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Indonesian) Currently translated at 55.6% (198 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Polish) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Dutch) Currently translated at 99.1% (106 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Asturian) Currently translated at 48.6% (52 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Italian) Currently translated at 82.8% (625 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovak) Currently translated at 99.6% (752 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (German) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Occitan) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Catalan) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Catalan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Occitan) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Dutch) Currently translated at 100,0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * i18n-tasks normalize * yarn manage:translations * Fix pluralizations * Fix inconsistent interpolation
2019-01-19Fix error when `scheduled_at` attribute is malformed (#9866)Eugen Rochko
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-18Fix missing account association in tombstone model (#9857)Eugen Rochko
2019-01-18Fix new hashtag page's items not being full-width on mobile (#9852)Eugen Rochko
Fix #9845
2019-01-18Fix REST API showing non-public reblogs for a given status (#9850)Eugen Rochko
2019-01-18Reject existing Follow in addition to sending a Block (#9811)ThibG
Mastodon expects remote servers to remove follow relationships upon receiving a Block. However, the spec only evokes Block activities in a C2S context, never in a S2S context. This PR, in addition to federating the Block, explicitly sends a Reject for any affected follow relationship, which makes a bit more sense with regards to the spec.
2019-01-18Add tombstones for remote statuses (#9830)ThibG
* Add Tombstone model to remember object deletion * Do not recreate a status if it has been deleted * Record Tombstone for remote deleted items Also, only record deleted items from same-host actors * Clear an user's tombstones when their key change
2019-01-18Add support for non-public reblogs from ActivityPub (#9841)Eugen Rochko
Fix #9838
2019-01-18Add information about how to opt-in to the directory on the directory (#9834)Eugen Rochko
Fix #9833
2019-01-18Fix code style of regeneration-related code (#9843)Eugen Rochko
2019-01-18Weblate translations (2019-01-17) (#9844)Eugen Rochko
* Translated using Weblate (Welsh) Currently translated at 94.7% (337 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Romanian) Currently translated at 99.2% (353 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Romanian) Currently translated at 11.8% (89 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Serbian) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Serbian) Currently translated at 74.8% (80 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 98.4% (62 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ нисам сигуран за ово "и не направите нову". слијед ријечи ми је мало чудан? * Translated using Weblate (Serbian) Currently translated at 75.7% (81 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ преподешавања за ПРЕСЕТ * Translated using Weblate (Catalan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Serbian) Currently translated at 80.4% (86 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * i18n-tasks normalize * yarn manage:translations
2019-01-17Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-17Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-17Improve the public hashtag page (#9831)Eugen Rochko
- Fix height not updating when clicking show more on public hashtag page - Add header to the public hashtag page - Change text size and margins on the public hashtag page
2019-01-17Hide floating action button on search and getting started pages (#9826)tmm576
2019-01-16Fix public hashtag timeline width on mobile, fix scrollbar width ↵ThibG
compensation (#9824) * Fix hashtag timeline width being potentially larger than window width * Add automatic computation of scrollbar width
2019-01-16Redesign public hashtag page to use a masonry layout (#9822)Eugen Rochko
2019-01-16Use summary as summary for converted ActivityPub objects (#9823)Eugen Rochko
Fix #8609
generated by cgit-pink (git 2.37.1) at 2024-12-12 04:28:00 +0000