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

4705 Commits (89f4e0298c2a8eb2c7f7c7faa89fb7021152927b)

Author SHA1 Message Date
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
 2018-05-16 21:52:38 +02:00
ThibG d3117e444d Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu 
[Glitch] Feature: Direct message from menu
 2018-05-16 20:17:08 +02:00
ThibG ec8a7b4164 Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color 
Fix mastodon-light background color of the composer textarea when posting
 2018-05-16 20:16:59 +02:00
Thibaut Girka 04eeaa0fa4 [Glitch] Reword the direct message warning 
Port 53c2164e9c to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka c77a4d8c51 [Glitch] Feature: Direct message from Statuses 
Port 7a06bd7085 to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka a8d5a4a74e [Glitch] Fix issues with sending direct messages from user profile 
Port 4be5383b91 to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka c5d2dcb562 [Glitch] Feature: Direct message from menu 
Port df62fc20bf to glitch-soc
 2018-05-16 19:45:30 +02:00
Thibaut Girka 8567ffd27d Fix mastodon-light background color of the composer textarea when posting 2018-05-16 19:37:44 +02:00
Evgeny Petrov e503a61a5a Russian language for 2.4.0 (#7512) 
* Russian language for 2.4.0

* Russian language for 2.4.0

* bundle exec i18n-tasks normalize

* RU: Updated some strings after new commits appeared
 2018-05-16 16:25:11 +02:00
Eugen Rochko 8adcc1d806 Fix images resized in browser getting cropped (#7514) 
Fix #7487
 2018-05-16 16:24:16 +02:00
Technowix f98e09bfaf French translation tweaks (#7513) 
- Use more neutral terminology for readability.
- Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product".
- Some fixes for accounts.
 2018-05-16 23:21:48 +09:00
Quentí b64100c049 [l10n] Occitan update (#7505) 
* Update oc.json

* Update doorkeeper.oc.yml

* Update oc.yml

* Update simple_form.oc.yml

* Update oc.json

Accept is the opp. of reject, I think it's better like this.

* bundle exec i18n-tasks normalize
 2018-05-16 23:18:32 +09:00
Sylvhem 6dfe10ff1e Reword the direct message warning (#7420) 
* Change direct message warning

Reword the direct message warning to set proper privacy expectations.

* Update the French translation

Update the French translation to reflect the changes made to the direct message warning.

* Wording update

Update the message's wording according to the feedback.
 2018-05-16 14:47:11 +02:00
Akihiko Odaki a81b1e6f10 Do not use permitted_for scope when querying pinned statuses (#7510) 
permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.
 2018-05-16 12:30:14 +02:00
Akihiko Odaki 5dadb6896b Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 
An explicit error allows user agents to know the error and Sidekiq to
retry.
 2018-05-16 12:29:45 +02:00
Akihiko Odaki 7dd6224ca1 Let navigator follow redirect instead that handling redirect in fetch (#7500) 
* Let navigator follow redirect instead that handling redirect in fetch

* Do not use cache when fetched resource is to redirect
 2018-05-16 04:59:44 +02:00
Akihiko Odaki 4e09854ccb Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506) 2018-05-15 21:42:31 +02:00
Akihiko Odaki 95b2bead0f Test if navigator.storage.estimate exists before using it (#7504) 2018-05-15 20:15:08 +02:00
Akihiko Odaki 82582dac2b Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503) 2018-05-15 20:14:30 +02:00
Marcin Mikołajczak 73f4c61bbd 🌍: 🇵🇱⬆️ (#7494) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-16 01:20:40 +09:00
unarist 63a10a7ffe Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) 
This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.
 2018-05-15 16:03:34 +02:00
Renato "Lond" Cerqueira 933f6e2ad4 Weblate translations 20180515 (#7496) 
* Translated using Weblate (Catalan)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 95.3% (597 of 626 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Korean)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Korean)

Currently translated at 99.8% (625 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Added translation using Weblate (Slovenian)

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 99.3% (623 of 627 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 98.4% (63 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/

* Translated using Weblate (Arabic)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 99.6% (294 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (76 of 76 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 7.8% (5 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Slovenian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 12.5% (8 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Italian)

Currently translated at 100.0% (295 of 295 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 11.9% (75 of 627 strings)

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

* Translated using Weblate (Slovenian)

Currently translated at 14.1% (89 of 627 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.5% (624 of 627 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.6% (625 of 627 strings)

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

* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused

* Remove translations causing issues in arabic

Related to #6673
 2018-05-15 14:25:07 +02:00
Akihiko Odaki 156fc9ab20 Clone response before using when caching web page (#7498) 2018-05-15 14:24:50 +02:00
Thibaut Girka f7b9911f71 Fix modals testing for props.noEsc (fixes #482) 2018-05-15 10:39:12 +02:00
Wiktor 37136f5986 Fix account URI when updating ActivityPub account (#7488) 
Updates account `uri` field on each call to `update_account` instead of
only once during `create_account` to mirror the same behavior in OStatus
`ResolveAccountService` class [0].

ActivityPub accounts are identified using `@username` and `@domain` pair
instead of URI since #6842.

This fixes #7479: a bug when the account identified by `@username` and
`@domain` changes its URI.

[0]:
060fa11ee2/app/services/resolve_account_service.rb (L121)
 2018-05-14 22:56:45 +02:00
David Yip edc99abc02 Merge pull request #476 from ThibG/fixes/update-scss 
Change local settings SCSS to be more consistent with modals
 2018-05-14 15:04:28 -05:00
Thibaut Girka 873f33d9ff Change local settings SCSS to be more consistent with modals 2018-05-14 21:39:04 +02:00
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
Akihiko Odaki 060fa11ee2 Disallow async function in service worker (#7482) 
offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an
alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6
uses uglify-js 2.8.29, which is not compatible with async function.
 2018-05-14 19:58:11 +02:00
Yamagishi Kazutoshi 4d5bec8a75 Add Slovene language (#7475) 2018-05-14 12:52:25 +02:00
abcang e6c952476c Call media.present? because media may be nil (#7474) 2018-05-14 12:51:53 +02:00
beatrix b221cc1707 Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme 
Port Sylvhem's mastodon-light to glitch flavour
 2018-05-13 18:57:58 -04:00
Eugen Rochko b0e1211eec Fix 404 for GET /api/v1/push/subscription (#7472) 
My bad...
 2018-05-13 21:45:18 +02:00
Eugen Rochko 7463d87ec3 Add GET /api/v1/push/subscription REST API (#7471) 
* Add Api::V1::Push::SubscriptionsController#show

* Add to routes
 2018-05-13 21:07:31 +02:00
Eugen Rochko 52a2498f60 Fix nil error in StatusFilter (#7470) 
Fix #7462
 2018-05-13 20:26:30 +02:00
Akihiko Odaki cffde88361 Test if navigator.storage is present before using it (#7460) 2018-05-13 13:48:32 +02:00
Yamagishi Kazutoshi efc482361b Open video modal on public UI (#7469) 2018-05-13 13:48:14 +02:00
ThibG 6e5b5d557c Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape 
Fix glitch-style bio fields incorrect HTML escaping in public profiles
 2018-05-12 17:53:01 +02:00
Thibaut Girka c39d227996 Fix glitch-style bio fields incorrect HTML escaping in public profiles 2018-05-12 17:45:30 +02:00
ThibG 4072475241 Improvements to toots display in admin view (#7452) 
* Distinguish boosts from original statuses in the admin panel (fixes #7449)

* Show the “show more” button in admin view to make CWs clearer (fixes #7451)

* Make content warnings swag
 2018-05-12 17:44:15 +02:00
ThibG 74c2a46423 Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459) 
When an ActivityPub Announce is processed and the boosted toot is not known,
fetch it on behalf of one of the booster's followers. This is to allow
fetching self-boosts of previously-unknown private toots.

If fetching on behalf of a user fails, try fetching it anonymously: the
selected follower of a boosting user may be banned by the boosted toot's
author.
 2018-05-12 16:48:32 +02:00
Yamagishi Kazutoshi fa7cdbeb67 Combine similar components into one on public UI (#7458) 2018-05-12 15:30:06 +02:00
ThibG 53c6402bd6 Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup 
Fix root modal's keyup handling (Fixes #478)
 2018-05-11 23:04:12 +02:00
Thibaut Girka 336d5fecdb Fix root modal's keyup handling (Fixes #478) 2018-05-11 22:42:32 +02:00
ThibG 11d6c34e62 Merge pull request #477 from ThibG/glitch-soc/merge 
Merge upstream changes
 2018-05-11 20:34:19 +02:00
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
 2018-05-11 18:12:42 +02:00
ThibG 692681241f Merge pull request #475 from ThibG/fixes/update-scss 
Update SCSS from upstream
 2018-05-11 16:51:14 +02:00
Thibaut Girka eafdb65af9 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka 951dee676d Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka fe36fabef1 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka 944bac0b41 [Glitch] Adjust RTL styles for landing page 
Port aef3f2775e to glitch-soc
 2018-05-11 14:34:23 +02:00
Thibaut Girka 5c96717144 Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka 86c477df23 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka d0641e77ac Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka 2a85b97eb6 Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
ThibG 6222c7def7 Update session activation time (fixes #5605) (#7408) 2018-05-11 13:20:58 +02:00
ThibG 37457543c7 Change wording of the “undo” media upload button (fixes #6857) (#7417) 2018-05-11 13:20:31 +02:00
ThibG b59416500e Catch Paperclip processing failures (fixes #6378) (#7439) 2018-05-11 13:14:50 +02:00
Shuhei Kitagawa fd0f2b675e Add tests for invites controller (#7441) 
* Add tests for invites controller

* Small refactoring and fix for invites controller
 2018-05-11 13:14:33 +02:00
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445) 
- POST /api/v1/push/subscription
- PUT /api/v1/push/subscription
- DELETE /api/v1/push/subscription
- New OAuth scope: "push" (required for the above methods)
 2018-05-11 11:49:12 +02:00
Yamagishi Kazutoshi a6bdefe811 Weblate translations (2018-05-10) (#7438) 
* Translated using Weblate (Arabic)

Currently translated at 83.6% (523 of 625 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.5% (622 of 625 strings)

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

* Translated using Weblate (French)

Currently translated at 99.6% (623 of 625 strings)

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

* Translated using Weblate (Korean)

Currently translated at 99.8% (624 of 625 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/

* Translated using Weblate (Finnish)

Currently translated at 95.1% (59 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/

* Translated using Weblate (Finnish)

Currently translated at 95.1% (59 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/

* Translated using Weblate (Finnish)

Currently translated at 99.6% (293 of 294 strings)

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

* Translated using Weblate (Finnish)

Currently translated at 96.7% (60 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/

* Translated using Weblate (Finnish)

Currently translated at 97.9% (612 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 90.8% (568 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

in overeestemming met andere vertalingen

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (2 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.2% (620 of 625 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.6% (623 of 625 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Galician)

Currently translated at 98.3% (61 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (German)

Currently translated at 99.2% (620 of 625 strings)

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

* Translated using Weblate (German)

Currently translated at 99.2% (620 of 625 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/

* Translated using Weblate (Esperanto)

Currently translated at 99.8% (624 of 625 strings)

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

* Translated using Weblate (Russian)

Currently translated at 93.5% (58 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/

* Translated using Weblate (Russian)

Currently translated at 95.1% (59 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/

I’m not sure this is the best translation for custom fields, something like «Характеристика» might work better; hopefully someone will review this for second opinions

* Translated using Weblate (Persian)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Persian)

Currently translated at 99.6% (623 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Persian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Russian)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (German)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (625 of 625 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.3% (621 of 625 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.2% (621 of 626 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (Japanese)

Currently translated at 92.1% (59 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 99.8% (624 of 625 strings)

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

* Translated using Weblate (Corsican)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/

* Translated using Weblate (Corsican)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/co/

* Translated using Weblate (French)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (French)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 90.8% (569 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 95.2% (596 of 626 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 99.8% (625 of 626 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/

* Translated using Weblate (Finnish)

Currently translated at 99.6% (293 of 294 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 93.7% (60 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (German)

Currently translated at 99.6% (624 of 626 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (64 of 64 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (German)

Currently translated at 99.6% (624 of 626 strings)

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

* Added translation using Weblate (Slovenian)

* Translated using Weblate (Slovenian)

Currently translated at 5.7% (36 of 626 strings)

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

* Added translation using Weblate (Slovenian)

* Translated using Weblate (Slovenian)

Currently translated at 1.3% (4 of 294 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.3% (184 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.3% (184 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.5% (185 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.5% (185 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.8% (187 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.8% (187 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.0% (188 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.0% (188 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.1% (189 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.3% (190 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.5% (191 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.5% (191 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 30.6% (192 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 33.7% (211 of 626 strings)

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

* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
 2018-05-10 14:48:26 +02:00
Yamagishi Kazutoshi b91c131afa Strip tags from og:description on public tag page (#7437) 2018-05-10 14:38:40 +02:00
Yamagishi Kazutoshi f286c23900 Add alternate for RSS (#7436) 2018-05-10 14:38:19 +02:00
Yamagishi Kazutoshi 59b48b923d Disable inflate gzip on head method (#7432) 2018-05-10 14:36:12 +02:00
Thibaut Girka 3c7d7ec228 [Glitch] Use plaintext value for field value tooltips in web UI 
Port 8b63d39427 to glitch-soc

This doesn't change anything for glitch-style fields, but those will go
away eventually
 2018-05-10 14:11:23 +02:00
Thibaut Girka 0033dbd115 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka 2e2758c25e Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka b8f8a3ea58 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi 1b42ea9f2c Support gzip encoding on Request (#7425) 2018-05-09 16:59:39 +02:00
Yamagishi Kazutoshi d006271514 Show card modal on public pages (#7428) 2018-05-09 16:22:52 +02:00
Yamagishi Kazutoshi e59fb1b969 Correct rotate of image using EXIF (#7422) 2018-05-09 08:41:07 +02:00
Yamagishi Kazutoshi 6092325a48 Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424) 2018-05-09 08:39:08 +02:00
David Yip 106a0d5c70 Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-08 09:43:33 -05:00
Yamagishi Kazutoshi c1427f90f6 Show media modal on public timeline (#7413) 2018-05-08 13:33:09 +02:00
Surinna Curtis a2b84b644b Take the first recognized actor_type. (#7410) 2018-05-08 13:30:04 +02:00
ThibG 8ccc863ae8 Do not crash in getStatusIds when there is a gap in the timeline (fixes #7400) (#7415) 
Fixes a crash occurring when the “gap” disconnection indicator is to be
displayed in a filtered timeline.
 2018-05-08 13:28:55 +02:00
ThibG 10be4c496c Fix hashtags not being federated on mentions (fixes #6900) (#7406) 2018-05-08 03:36:59 +02:00
Thibaut Girka dc597005b3 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
beatrix e774936358 Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements 
Various improvements to the reports modal
 2018-05-07 09:45:13 -04:00
Thibaut Girka 3333cce41e Hide media in report modal regardless of whether they are marked sensitive 
The rationale behind this is that if the user wants to report violent media,
they might not want to see it repeatedly. The “sensitive” property is still
kept, displaying different messages for hidden media depending on whether
they are marked as sensitive.
 2018-05-07 15:00:55 +02:00
Thibaut Girka 49181d497f [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka d5e0e665df [Glitch] Also display replies in report modal 
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
 2018-05-07 14:55:16 +02:00
Eugen Rochko 244a270a80 If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398) 
* If an OStatus message contains nsfw hashtag, mark it as sensitive

Undo parts of #7048

* Put nsfw hashtag on OStatus messages if they have any media

* Fix code style issues
 2018-05-07 14:49:13 +02:00
Thibaut Girka 557db7ae6d Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391) 
* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
 2018-05-07 09:31:07 +02:00
Eugen Rochko b890e5830c Support explicitly supplying language code for status via REST API (#7389) 2018-05-07 09:30:53 +02:00
Eugen Rochko 8b63d39427 Use plaintext value for field value tooltips in web UI (#7388) 
Fix #7383
 2018-05-07 09:30:38 +02:00
abcang b9c17c6580 Fix distribute_add_activity and distribute_remove_activity (#7393) 2018-05-07 09:30:18 +02:00
Eugen Rochko 93553c17c8 Add Corsican localization (#7390) 
* Added Corsican localization

* Declaring Corsican localization

* Fixed activerecord locale

* Added a missing translation and switched to French-style apostrophes

* Fixed a (predictable) mistake made while bulk-replacing apostrophes

* More fixing

* i18n-tasks normalize
 2018-05-07 01:34:19 +02:00
David Yip d01cb2c8e3 Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes 
Glitch soc/rollback scroll changes
 2018-05-06 17:39:07 -05:00
ThibG 796fe4c361 Fixes/rollback scroll changes (#7387) 
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)"

This reverts commit 554653a423.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 9188537f5f.
 2018-05-06 22:26:39 +02:00
Thibaut Girka 04a8aef9d2 Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 1c75c7901f.
 2018-05-06 21:50:33 +02:00
Thibaut Girka 82421dc2e2 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit ca62d8bcc6.
 2018-05-06 21:50:26 +02:00
Thibaut Girka 1bc1d8e676 Fix glitch high-contrast skin text colors 
Port from e0c3d950d1
 2018-05-06 21:00:35 +02:00
ThibG 520f3a28fc Various improvements to the report UI (#7342) 
* Also display replies in report modal

* Allow report modal to be up to 80% of viewport height

* Use narrow no-break space where needed in the French translation
 2018-05-06 20:38:17 +02:00
beatrix f5f840cdb3 Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility 
Improve accessibility of toot dropdown menu
 2018-05-06 12:12:20 -04:00
beatrix 923e79ea00 Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement 
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
 2018-05-06 11:33:09 -04:00
beatrix 1cd9812d52 Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over 
Prevent timeline from moving when cursor is hovering over it
 2018-05-06 11:32:56 -04:00
beatrix c21fe3e7a0 Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables 
Add text color variables + minor SCSS fixes + high contrast skin
 2018-05-06 11:32:42 -04:00
beatrix a3884450fc Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes 
Escape regex metachars in keyword mutes
 2018-05-06 11:32:22 -04:00
beatrix 3f7348c436 Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items 
Support upstream bio items / custom account fields
 2018-05-06 11:32:05 -04:00
Yamagishi Kazutoshi a14525d3df Weblate translations (2018-05-06) (#7381) 
* Translated using Weblate (Dutch)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (Greek)

Currently translated at 28.2% (177 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 98.2% (615 of 626 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 97.9% (613 of 626 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (626 of 626 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (627 of 627 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Greek)

Currently translated at 28.5% (179 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 28.5% (179 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.0% (182 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.0% (182 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.2% (183 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.3% (184 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.5% (185 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.7% (186 of 626 strings)

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

* Translated using Weblate (Greek)

Currently translated at 29.7% (186 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 95.3% (597 of 626 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 95.2% (597 of 627 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 97.6% (612 of 627 strings)

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

* Translated using Weblate (Chinese (Hong Kong))

Currently translated at 99.3% (623 of 627 strings)

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

* Translated using Weblate (Polish)

Currently translated at 99.8% (626 of 627 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 83.7% (525 of 627 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 99.8% (626 of 627 strings)

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

* Translated using Weblate (Italian)

Currently translated at 54.7% (343 of 627 strings)

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

* Translated using Weblate (Italian)

Currently translated at 78.9% (495 of 627 strings)

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

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (294 of 294 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.8% (626 of 627 strings)

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

* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
 2018-05-06 20:19:56 +09:00
Eugen Rochko 4055ce490c Enable custom emojis in profiles (notes, field values, display names) (#7374) 
Follow-up to #6124
 2018-05-06 11:48:51 +02:00
Thibaut Girka 2b5821b86b Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00
ThibG 78ac856e5b Merge pull request #457 from m4sk1n/glitch-light 
Add a light theme by @Sylvhem
 2018-05-06 11:21:26 +02:00
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378) 
* Add confirmations_controller#resend

* Add tests for confirmations_controller#resend

* Add translations
 2018-05-06 10:59:03 +02:00
Eugen Rochko a1398887ae Add hint about 7 day cooldown for archive takeout (#7375) 2018-05-06 10:53:10 +02:00
Eugen Rochko 14393f29ef Add contact e-mail hint to 2FA login form (#7376) 2018-05-06 10:52:36 +02:00
Eugen Rochko 2ee5d518f1 Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371) 
Fix #7367
 2018-05-05 23:07:51 +02:00
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360) 
* Improve design of account statuses admin UI (consistent with reports)

* Make account moderation notes look consistent with report notes

* i18n-tasks remove-unused

* Fix code style issues

* Fix tests
 2018-05-05 23:06:29 +02:00
Eugen Rochko b7f241faed Do not count search route as compose being mounted in web UI (#7372) 
Fix #7144
 2018-05-05 23:05:43 +02:00
Thibaut Girka 8abac3dcb8 minor fix 2018-05-05 22:38:15 +02:00
Thibaut Girka 345d5aeba1 [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00
Thibaut Girka 18c7b739eb Move attachment-lists out of lists.scss 2018-05-05 22:33:02 +02:00
Thibaut Girka 995eea1836 [Glitch] Fix text color in "show more" link inside boost confirmation modal 
Port b5d0bf338c to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka 0bf81fde9b Fix link colors in report modal 2018-05-05 22:33:02 +02:00
Thibaut Girka c58ee84022 [Glitch] Add color variables of texts for better accesibility 
Port e5ad96390e and related to glitch-soc
 2018-05-05 22:33:02 +02:00
Eugen Rochko 0de45574e0 4 profile fields max, store only 255 characters per name/value (#7348) 
Fix #7303
 2018-05-05 21:11:19 +02:00
Eugen Rochko ef1a273322 Fix handling of malformed ActivityPub payloads when URIs are nil (#7370) 
* Fix handling of malformed ActivityPub payloads when URIs are nil

* Gracefully handle JSON-LD canonicalization failures
 2018-05-05 18:22:34 +02:00
Thibaut Girka a565aa6530 [Glitch] Update SCSS of admin and setting pages 
Port the SCSS changes from 18d4e03e6b to glitch-soc
 2018-05-05 17:58:01 +02:00
Thibaut Girka 6c4ea9c000 [Glitch] Improve styling of closed registrations message 
Port SCSS changes from f67fe3ebe8 to glitch-soc
 2018-05-05 17:43:09 +02:00
Thibaut Girka ca62d8bcc6 [Glitch] Do not re-position scroll when loading more (inserting items from below) 
Port 554653a423 to glitch-soc
 2018-05-05 17:18:55 +02:00
Thibaut Girka 1c75c7901f [Glitch] Prevent timeline from moving when cursor is hovering over it 
Port 9188537f5f to glitch-soc
 2018-05-05 17:18:25 +02:00
Thibaut Girka eea6b78afc Improve accessibility of toot dropdown menu 
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in generic dropdown menus

Partial port from ef7d64c801 to glitch-soc
 2018-05-05 17:11:48 +02:00
Thibaut Girka 02876fd33c [Glitch] Place emoji picker top if it is closer to the bottom of the viewport 
Port a661a25845 to glitch-soc
 2018-05-05 16:58:20 +02:00
Eugen Rochko 9a84024b1e Improve rendering of bio fields (#7353) 
Fix #7335
 2018-05-05 00:55:09 +02:00
Akihiko Odaki 575c5753e4 Fix gap insertion for timeline disconnection (#7363) 2018-05-05 00:54:56 +02:00
Eugen Rochko 8913ccb434 Store home feeds for 7 days instead of 14 (#7354) 
* Store home feeds for 7 days instead of 14

Reduces workload for status fan-out to active followers

* Fix test for user model
 2018-05-05 00:54:24 +02:00
ThibG f0af3ac6b3 Dropdowns accessibility (#7318) 
* Mark currently selected privacy setting in privacy dropdown

* Prevent Enter keypresses from triggering dropdown display toggle twice

* Give focus to first/selected item of dropdown menus

* Implement keyboard navigation in privacy dropdown

* Implement keyboard navigation in generic dropdown menus
 2018-05-04 22:13:26 +02:00
Daggertooth b60e38c985 Escape metachars in keywords 2018-05-04 14:58:11 -05:00
David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
    	db/schema.rb
 2018-05-04 14:16:30 -05:00
Eugen Rochko 154076e8e7 Store URIs of follows, follow requests and blocks for ActivityPub (#7160) 
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
 2018-05-04 21:14:34 +02:00
Marcin Mikołajczak 73e3585042 Add a light theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 20:25:58 +02:00
Jenkins 3fc6e7dabb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
ThibG 8a6cba44aa Do not render first page of following and followers collections unless explicitly asked to (#7357) 2018-05-04 20:17:01 +02:00
Eugen Rochko 93b8db8f08 Better pagination for ActivityPub outbox (#7356) 2018-05-04 19:19:11 +02:00
David Yip ec2dc881dd Merge branch 'merge-upstream' into gs-master 2018-05-04 12:04:55 -05:00
Marcin Mikołajczak 17fa2c7aa6 “Enable” high contrast theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 17:50:11 +02:00
David Yip ea46024add Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	Gemfile.lock
 2018-05-04 09:42:31 -05:00
Eugen Rochko d9eda62221 Show remote reports in admin UI as coming from domain rather than user (#7347) 
Fix #6994
 2018-05-04 13:26:25 +02:00
David Yip b0dcceb9fe Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-04 03:47:35 -05:00
David Yip 976347fa78 Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-04 03:23:57 -05:00
David Yip dde7fa8bbe Remove unnecessary code from MediaAttachment#set_type_and_extension. 
Well, it seems unnecessary, anyway.
 2018-05-04 02:38:04 -05:00
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
 2018-05-03 17:23:44 -05:00
ThibG f2ecedaab5 Fixes/do not override timestamps (#7336) 
* Revert "Fixes/do not override timestamps (#7331)"

This reverts commit 9c1e1005f4.

* Document Snowflake ID corner-case a bit more

Snowflake IDs are used for two purposes: making object identifiers harder to
guess and ensuring they are in chronological order. For this reason, they
are based on the `created_at` attribute of the object.

Unfortunately, inserting items with older snowflakes IDs will break the
assumption of consumers of the paging APIs that new items will always have
a greater identifier than the last seen one.

* Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at
 2018-05-03 23:02:46 +02:00
ThibG 554653a423 Do not re-position scroll when loading more (inserting items from below) (#7344) 2018-05-03 22:32:05 +02:00
Yamagishi Kazutoshi 5bd8cda844 Add el and te (#7332) 
* Add el and te

* Add missing locale files
 2018-05-03 15:54:10 +02:00
ThibG 9c1e1005f4 Fixes/do not override timestamps (#7331) 
* Do not override timestamps for incoming toots

* Remove every reference to override_timestamps

Statuses are now created with the announced publishing date
and are only pushed to timelines if that date is at most
6 hours earlier than the time at which it is processed.
 2018-05-03 13:33:08 +02:00
Eugen Rochko 9bd3723f06 Revert "Do not override timestamps for incoming toots" (#7330) 
* Revert "Weblate translations 20180503 (#7325)"

This reverts commit b84b11c41a.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 9188537f5f.

* Revert "Add pry-byebug (#7307)"

This reverts commit 7236e9effe.

* Revert "Do not override timestamps for incoming toots (#7326)"

This reverts commit b6f4e83c93.
 2018-05-03 12:32:33 +02:00