treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,499 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

5949 Commits (d524244d3a1e1becc0c491f0c7c2f914920e1a58)

Author SHA1 Message Date
Thibaut Girka 00fc362103 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port b5feaa4d54 to glitch-soc
 2019-01-27 22:02:59 +01:00
Thibaut Girka 333d3a2990 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG b5feaa4d54 Fix initial value of volume slider in video player and handle volume changes (#9929) 
* Fix initial value of volume slider in video player and handle volume changes

* Clean up dead/incorrect code
 2019-01-27 21:18:15 +01:00
ThibG 09f7773e26 Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
Thibaut Girka 0ccf92ad09 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka 9bd95f11e5 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka bb035bb0ab Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG b1c76ef610 Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
Thibaut Girka edb28be20b Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
Eugen Rochko e259f244c6 Fix SSO authentication not working due to missing agreement boolean (#9915) 
Fix #9906
 2019-01-25 12:36:54 +01:00
trwnh 36b6fee96d Fix Firefox scrollbar color regression in #9210 (#9908) 
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-25 11:48:27 +01:00
Jeong Arm fdf6c4a63f Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka a9c3e77e81 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira cde2fe25b9 Rescue SSL error in verify link service (#9914) 
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-24 15:38:18 +01:00
trwnh 26fc37a2ea Fix Firefox scrollbar color regression in #9210 (#9908) 
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-24 13:32:23 +01:00
Thibaut Girka 5e7c9c04e2 Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Jeong Arm f909d00241 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
ThibG a238beb870 Fix scheduled toot with media immediately creating a toot (#9894) 
* 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-21 20:03:04 +01:00
Thibaut Girka 827933cd09 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
Eugen Rochko 58f77b7de2 Fix multiple workers for the same scheduled status being queueable (#9875) 2019-01-20 12:57:05 +01:00
Eugen Rochko f77529ca00 Fix directory showing tags that have no currently eligible accounts (#9872) 2019-01-20 12:56:53 +01:00
mayaeh da1a2d19af i18n: Update Japanese translations (#9871) 
* Update Japanese translations.

* Delete unused translation.
 2019-01-20 12:37:38 +01:00
Thibaut Girka 14c617983d [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port cbb8399df4 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka 8dea30a0c7 [Glitch] Hide floating action button on search and getting started pages 
Port 180a665f29 to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576 30f3dad8e8 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka a847f3bec6 [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port d28a2f7636 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka a205783d1c [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from 86087f7461 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) c4a352bbf6 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka eaebfc67d8 [Glitch] Improve the public hashtag page 
Port 43014334f8 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka 8219940214 [Glitch] Redesign public hashtag page to use a masonry layout 
Port 380b246728 to glitch flavour
 2019-01-20 11:38:09 +01:00
Eugen Rochko 39fa85a023 Weblate translations (2019-01-19) (#9867) 
* 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-19 23:43:06 +01:00
Eugen Rochko 17a8c10a03 Fix error when `scheduled_at` attribute is malformed (#9866) 2019-01-19 22:01:01 +01:00
Thibaut Girka b49d415f37 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko 960b3b2257 Fix missing account association in tombstone model (#9857) 2019-01-18 23:52:09 +01:00
Eugen Rochko d28a2f7636 Fix new hashtag page's items not being full-width on mobile (#9852) 
Fix #9845
 2019-01-18 20:58:11 +01:00
Eugen Rochko 83fdb7b4f4 Fix REST API showing non-public reblogs for a given status (#9850) 2019-01-18 20:58:00 +01:00
ThibG 8de5d28891 Reject existing Follow in addition to sending a Block (#9811) 
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-18 15:57:19 +01:00
ThibG d0008b5051 Add tombstones for remote statuses (#9830) 
* 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-18 15:56:55 +01:00
Eugen Rochko 77f972d5b1 Add support for non-public reblogs from ActivityPub (#9841) 
Fix #9838
 2019-01-18 15:56:21 +01:00
Eugen Rochko 86087f7461 Add information about how to opt-in to the directory on the directory (#9834) 
Fix #9833
 2019-01-18 10:25:44 +01:00
Eugen Rochko 9a98e3fe76 Fix code style of regeneration-related code (#9843) 2019-01-18 01:02:51 +01:00
Eugen Rochko 4abfcbd614 Weblate translations (2019-01-17) (#9844) 
* 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-18 00:48:09 +01:00
Mélanie Chauvel (ariasuni) 06668c1959 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-17 23:28:30 +01:00
tmm576 393a56d611 Allow event defaults on index for text data transfer (#9840) 2019-01-17 23:27:51 +01:00
Eugen Rochko 43014334f8 Improve the public hashtag page (#9831) 
- 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-17 14:06:08 +01:00
tmm576 180a665f29 Hide floating action button on search and getting started pages (#9826) 2019-01-17 09:22:12 +01:00
ThibG cbb8399df4 Fix public hashtag timeline width on mobile, fix scrollbar width compensation (#9824) 
* Fix hashtag timeline width being potentially larger than window width

* Add automatic computation of scrollbar width
 2019-01-16 20:36:10 +01:00
Eugen Rochko 380b246728 Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00
Eugen Rochko 9b0c7cfa6f Use summary as summary for converted ActivityPub objects (#9823) 
Fix #8609
 2019-01-16 18:36:17 +01:00
ThibG b8867a3412 Reduce chances of race conditions when processing deleted toots (#9815) 
* Reduce chances of race conditions when processing deleted toots

* Prevent race condition when processing deleted toots
 2019-01-16 15:42:00 +01:00