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

5959 Commits (c9d261753aa4f3ec3439925fed03ea098bb96f72)

Author SHA1 Message Date
Thibaut Girka c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
Eugen Rochko 663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka 2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
 2019-02-01 16:12:20 +01:00
Thibaut Girka f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka 762e4fdf55 Fix hashtag processing when sending toots 
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-02-01 12:37:28 +01:00
Eugen Rochko ad8c71c985
Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 00:15:38 +01:00
Eugen Rochko 1f95190202
Refactor icons in web UI to use Icon component (#9951) 
* Refactor uses of icons to an Icon component in web UI

* Refactor options passed to the Icon component

* Make tests work with absolute component paths
 2019-02-01 00:14:05 +01:00
Clar Charr 6513f6c953 Replace unlock-alt icon with unlock (#9952) 2019-01-31 13:45:15 +01:00
Thibaut Girka f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
Thibaut Girka 72bab194ad Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG a53dcaa298 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 ec5bd8b8bb Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
Thibaut Girka 7251bc3853 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka f938800ef4 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka 05415fa5d3 Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG e2a5be6e9a Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
Thibaut Girka 80d954ec10 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
Eugen Rochko 9519d55332
Fix SSO authentication not working due to missing agreement boolean (#9915) 
Fix #9906
 2019-01-25 12:36:54 +01:00
trwnh 8ef0498f1c 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 77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka 04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira e1ec3a9f09 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 c87863bdd1 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 c30da25c5f Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Jeong Arm d50e824168 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
ThibG 061feb63ed 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 9dfbcf941e Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
Eugen Rochko 31e7940de5
Fix multiple workers for the same scheduled status being queueable (#9875) 2019-01-20 12:57:05 +01:00
Eugen Rochko 6b91da97bb
Fix directory showing tags that have no currently eligible accounts (#9872) 2019-01-20 12:56:53 +01:00
mayaeh c80b89c2a8 i18n: Update Japanese translations (#9871) 
* Update Japanese translations.

* Delete unused translation.
 2019-01-20 12:37:38 +01:00
Thibaut Girka 5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576 9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka 8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) 6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka 02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka 3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Eugen Rochko c3f57188ae
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 6ca9015789
Fix error when `scheduled_at` attribute is malformed (#9866) 2019-01-19 22:01:01 +01:00
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko 80768e2840
Fix missing account association in tombstone model (#9857) 2019-01-18 23:52:09 +01:00
Eugen Rochko b506ce1197
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 32daecffef
Fix REST API showing non-public reblogs for a given status (#9850) 2019-01-18 20:58:00 +01:00
ThibG aeb124491d 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 75b1488cf4 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 31f396b57d
Add support for non-public reblogs from ActivityPub (#9841) 
Fix #9838
 2019-01-18 15:56:21 +01:00
Eugen Rochko a492a9bcd3
Add information about how to opt-in to the directory on the directory (#9834) 
Fix #9833
 2019-01-18 10:25:44 +01:00