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

7438 Commits (dc381facbd01297f2e844198519a15382705b38b)

Author SHA1 Message Date
Yamagishi Kazutoshi 8a0670a54e Integrating `:one` and `:other` in ar.yml (#8555) 2018-09-01 19:41:21 +02:00
ThibG 82cbf325c2 Merge pull request #699 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-09-01 17:44:06 +02:00
Thibaut Girka 65e4345a48 Merge branch 'master' into glitch-soc/merge-upstream 2018-09-01 17:23:46 +02:00
Yamagishi Kazutoshi 35beafabe9 Fix static URL when disable autoplay (#8548) 2018-09-01 16:09:24 +02:00
Thibaut Girka b72cc57175 Fix composer not displaying on chrome mobile (fixes #696) 2018-09-01 09:39:25 +02:00
Eugen Rochko 894e01163b Bump version to 2.5.0rc2 2018-09-01 03:37:43 +02:00
trwnh 150ec66461 Fix the display of missing lists (#8523) 
* Fix the display of missing lists

See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.

* import ColumnBackButton

missed the import with the first commit
 2018-09-01 03:36:36 +02:00
Eugen Rochko 32d3152852 Fix wrong string being used on login failure when using LDAP (#8534) 
Fix #8527
 2018-09-01 03:35:37 +02:00
ThibG abc03a3b9d Merge pull request #694 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-31 20:56:22 +02:00
ThibG b13f1d470a Do not show follow button on moved or memorial accounts (#8546) 
This restores the logic from before the public profile redesign. Fixes #8503
 2018-08-31 20:33:01 +02:00
Thibaut Girka daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
 2018-08-31 19:10:57 +02:00
Thibaut Girka ff18ba0d2b Add option to not automatically unfold content warnings matching a regexp 
Fixes #678
 2018-08-31 18:35:03 +02:00
Thibaut Girka 2fbebd89fb Allow text inputs in local settings dialog 2018-08-31 18:35:03 +02:00
Thibaut Girka 02c32ad7af Add a setting to automatically unfold all content warnings 2018-08-31 18:35:03 +02:00
Thibaut Girka a3afd0791d [Glitch] Show compose form on delete & redraft when in mobile layout 
Port 97a2958ba1 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka f485e2ced3 Fix search results on compose box 2018-08-31 18:33:46 +02:00
Thibaut Girka 923a7f3f11 Fix account header showing on search page 2018-08-31 18:33:46 +02:00
Thibaut Girka deb14b957a [Glitch] On the mobile UI, move the search column to the right 
Port 5f0b9c5d36 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 89b50796ba [Glitch] Hide search from Compose on mobile devices 
Port f48902e6e6 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka fb195f37bb [Glitch] Add search item to tab bar for mobile devices 
Port 0e5e60a84b to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 042b5212cd [Glitch] Use withRouter for TabsBar 
Port 2040094568 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka e88fe59712 [Glitch] Move "compose" on mobile to floating action button 
Port 1237c34997 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 000b9f7b03 [Glitch] When search enabled, display hint in search popout 
Port a91ef56e80 to glitch-soc
 2018-08-31 18:33:46 +02:00
caasi Huang b61793b3fc Translate more messages to Traditional Chinese (#8543) 2018-08-31 23:22:03 +09:00
ThibG 108623e86d Self-notify on accepting follow requests (#8541) 2018-08-31 15:17:31 +02:00
Renato "Lond" Cerqueira d516e7fa62 Fix autoplay issue with spoiler tag (#8540) 
Add tests to avoid similar issues in the future
 2018-08-31 15:16:59 +02:00
Yamagishi Kazutoshi 699ab3075b Save button for relays translatable (#8539) 2018-08-31 15:15:21 +02:00
Yamagishi Kazutoshi 724a6fa7e4 Normalize Welsh (#8538) 2018-08-31 15:12:06 +02:00
Eugen Rochko 2eac55cb3a Add Welsh language option (#8536) 2018-08-31 18:16:19 +09:00
Eugen Rochko 7d467f38d3 Weblate translations (2018-08-31) (#8535) 
* Translated using Weblate (Portuguese (Brazil))

Currently translated at 95.8% (320 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (686 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Japanese)

Currently translated at 92.8% (310 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Greek)

Currently translated at 99.9% (686 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Korean)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Greek)

Currently translated at 98.8% (330 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Japanese)

Currently translated at 92.8% (310 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (687 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (687 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Occitan)

Currently translated at 100,0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Czech)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 99.9% (686 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Turkish)

Currently translated at 96.7% (323 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/

* Translated using Weblate (French)

Currently translated at 99.0% (680 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Arabic)

Currently translated at 97.4% (669 of 687 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Greek)

Currently translated at 99.9% (687 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Galician)

Currently translated at 100,0% (688 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Czech)

Currently translated at 99.9% (687 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Arabic)

Currently translated at 97.7% (672 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Danish)

Currently translated at 100,0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Danish)

Currently translated at 100,0% (688 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Danish)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (688 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Persian)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 99.7% (686 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Polish)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/

* Translated using Weblate (Arabic)

Currently translated at 97.8% (673 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 98.0% (674 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Thai)

Currently translated at 35.0% (241 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 97.6% (326 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/

* Translated using Weblate (Italian)

Currently translated at 81.2% (559 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Turkish)

Currently translated at 34.9% (240 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 86.6% (596 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 88.4% (608 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/

* Translated using Weblate (Bulgarian)

Currently translated at 15.3% (105 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/

* Added translation using Weblate (Welsh)

* Translated using Weblate (Japanese)

Currently translated at 98.8% (680 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Danish)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Danish)

Currently translated at 100.0% (688 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Welsh)

Currently translated at 2.5% (17 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 2.5% (17 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 6.4% (44 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 13.7% (94 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 13.7% (94 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 13.7% (94 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (French)

Currently translated at 100,0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 99.9% (687 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Basque)

Currently translated at 100.0% (334 of 334 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* Translated using Weblate (Basque)

Currently translated at 98.5% (678 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/

* Translated using Weblate (Occitan)

Currently translated at 97.2% (669 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Welsh)

Currently translated at 14.4% (99 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 15.6% (107 of 688 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Added translation using Weblate (Welsh)

* Added translation using Weblate (Welsh)

* Added translation using Weblate (Welsh)

* Added translation using Weblate (Welsh)

* Added translation using Weblate (Welsh)

* i18n-tasks normalize && yarn manage:translations

* Fix empty cy YML files
 2018-08-31 04:28:29 +02:00
Eugen Rochko b8e126ca0f Do not sign useless User-Agent or Accept-Encoding headers (#8533) 
Fix #8080
 2018-08-31 04:22:52 +02:00
mayaeh 6823e24a9d Add --verbose and --dry-run option to tootctl media remove (#8519) 
* Add --verbose and --dry-run options to CLI interface for removing remote media.

* Fix coding style problem.
 2018-08-31 03:46:13 +02:00
takayamaki c0cb0c84e2 refactor: getting-started__wrapper should contained in getting-started (#8532) 2018-08-31 03:43:02 +02:00
M Somerville 2903971e04 Inactive header in main profile to match column. (#8520) 2018-08-30 23:53:30 +02:00
Renato "Lond" Cerqueira c7423078ce Add animate custom emoji param to embed pages (#8507) 
* Add animate custom emoji param to embed pages

* Rename param, use it for avatars and gifs

* Fix issues pointed by codeclimate and breaking test

* Ignore brakeman warning
 2018-08-30 23:14:01 +02:00
Thibaut Girka 253dd5fb12 Add bookmarks to archive takeout 2018-08-30 16:29:47 +02:00
Thibaut Girka 9ca7d1c7c8 Restrict querySelectorAll to the upload form component 2018-08-30 13:20:37 +02:00
Thibaut Girka fa5f416270 Add confirmation dialog when posting media without description 
Fixes #211
 2018-08-30 13:20:37 +02:00
Renato "Lond" Cerqueira 900d3e214b Fix nil host in remotable (#8508) 
Host can be nil in urls like
'https:https://example.com/path/file.png'
 2018-08-29 21:13:49 +02:00
Thibaut Girka 08c26ab391 [Glitch] Reduce padding of profile metadata boxes to allow more text 
Port dad47a60d5 to glitch-soc
 2018-08-29 19:28:59 +02:00
mayaeh 2adac68cc7 Fix CLI interface for removing remote media (#8506) 
* Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached.

* Revert

This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662.

* Change to obtain and pass all columns when "--background" option is false.
 2018-08-29 18:35:09 +02:00
Finariel c1e1e7f515 Update de.json (#8515) 
"was gibt's neues" -> was gibt's Neues
 2018-08-29 22:39:34 +09:00
Thibaut Girka 8f33f0f087 Add opt-in feature to have the spoilers field always on (fixes #634) 2018-08-29 14:29:36 +02:00
ThibG 2b5dd39fbb Merge pull request #690 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-29 14:23:45 +02:00
Thibaut Girka ac4e67e535 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-29 13:57:56 +02:00
caasi Huang d51ab49ca0 Replace '貼' with '嘟' for 'toot' (#8421) 
Replace '貼' with '嘟' so the web front-end looks more consistent.
 2018-08-29 18:05:22 +09:00
Satsuki Yanagi 4c3c69ff91 Add ffmpeg buildpack for scalingo (#8500) 
* Add ffmpeg buildpack for scalingo.

* Add environment variable to install ffprobe

Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable.
 2018-08-29 01:21:23 +02:00
sundevour 45af08148d formatter spec fixes & clarification (#8481) 
updates some "context" and "it" lines to have clearer explanations
updates "context" lines to properly describe function input, and "it" lines to describe results
 2018-08-29 01:20:56 +02:00
Mélanie Chauvel (ariasuni) dad47a60d5 Reduce padding of profile metadata boxes to allow more text (#8491) 2018-08-29 01:20:11 +02:00
Jakub Mendyk 816384cf32 Fix followers/follows layout issues from #8418 (#8505) 
* Add alwaysShowScrollbar prop to ScrollableList

* Fix followers/follows layout issues from #8418
 2018-08-29 01:19:58 +02:00