about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2020-07-07Change "edit" label on media uploads to "describe"Starfall
Picked out all the languages users currently have set on plural.cafe
2020-07-07Mastodon 3.1.5 / Merge branch 'glitch' into mainStarfall
2020-07-07[Glitch] Add ability to choose media thumbnail in web UIEugen Rochko
Port 06fc6a9cd4c700c450dbe8e8c579a5d5bc4ba732 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07[Glitch] Fix hashtag column options stylingThibG
Port a783bdf4adee3444e9cd32c2eaa0712214ba1230 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.
2020-07-07Fix media attachments enumeration (#14254)Eugen Rochko
* Fix media attachment enumeration * Switch media_attachments id to snowflake ids Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07Fix other sessions not being logged out on password change (#14252)Eugen Rochko
While OAuth tokens were immediately revoked, accessing the home controller immediately generated new OAuth tokens and "revived" the session due to a combination of using remember_me tokens and overwriting the `authenticate_user!` method
2020-07-07Fix account note border radius (#14251)Sasha Sorokin
2020-07-07Add ability to choose media thumbnail in web UI (#14244)Eugen Rochko
2020-07-07Change User-Agent of link preview fetching service to include "Bot" (#14248)Eugen Rochko
This forces Twitter to render OpenGraph tags in the response
2020-07-07Fix hashtag column options styling (#14247)ThibG
* Enable nonces for stylesheets * Pass nonce to react-select
2020-07-07Change design of account notes in web UI (#14208)Eugen Rochko
* Change design of account notes in web UI * Fix `for` -> `htmlFor`
2020-07-06Replace shortNumberFormat with <ShortNumber> (#14061)Sasha Sorokin
This commit introduces new utility component - ShortNumber. It should work almost the same way as original shortNumberFormat function, though it also localizes units and accepts one more prop - renderer. Renderer is a function that takes rendered short formatted number and also ready-to-pluralize number to format display result accordingly. Ready-to-pluralize number allows to correctly select plural for compactly notated numbers, respecting thousands and other units. Issue #12451 accurately describes the issue with using raw numbers when replacing counter with short version. In short, it doesn't work with languages such as Russian, that require different plurals, according to the unit number was compacted to. All previous usages of shortNumberFormat were replaced with new function, and as it became unused, it was removed to avoid misleading.
2020-07-06Fix restored words from "toot" to "status" (#14242)mayaeh
2020-07-05[Glitch] Add color extraction for audio thumbnailsEugen Rochko
Port 99f3a5554074d9a12619797c474b3de4c6085f02 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05[Glitch] Fix audio modals not using blurhash and posterEugen Rochko
Port 162adf61f268beac6e178f6f79f203b213055915 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
2020-07-05Add color extraction for audio thumbnails (#14209)Eugen Rochko
2020-07-03Merge branch 'glitch' into mainStarfall
2020-07-03Filter own toots out of timeline againStarfall
Reverts tootsuite/mastodon#14128
2020-07-03Fix-up #13749 (#14204)mayaeh
2020-07-02[Glitch] Add customizable thumbnails for audio and video attachmentsEugen Rochko
Port 64aac3073340dbc92c33f5f1c6f76dcafa77a450 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02[Glitch] Fix various issues around OpenGraph representation of mediaEugen Rochko
Port audio player changes from 662a49dc3f06749936cedd7349092bbe622f0bc6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UIEugen Rochko
Port bb9ca8a587ee5a3ec8778e72828aca0ba8871327 to glitch-soc Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02[Glitch] Change volume control and download buttons in web UIEugen Rochko
Port 419ad6248beb192f34ef581306138c3ff0d600a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02[Glitch] Fix audio player not working when media files are hosted on a ↵ThibG
different domain Port aaf91abffae590b2db1b9e6a7dd2a9e2b06b06ca to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02[Glitch] Change design of audio players in web UIEugen Rochko
Port 75a2b8f8153ce3a6496fcaf6eedf9f2bb7c729e6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02Fix audio modals not using blurhash and poster (#14199)Eugen Rochko
2020-07-02[Glitch] Fix the conditions for incomplete remote contentTakeshi Umeda
Port 7548a474a5f07f152e6fc0dac55bef78ac5ab1dd to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-07-02New Crowdin translations (#13749)Eugen Rochko
* New translations en.json (Galician) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Taigi) [ci skip] * New translations en.yml (Taigi) [ci skip] * New translations simple_form.en.yml (Taigi) [ci skip] * New translations activerecord.en.yml (Taigi) [ci skip] * New translations devise.en.yml (Taigi) [ci skip] * New translations doorkeeper.en.yml (Taigi) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Silesian) [ci skip] * New translations en.yml (Silesian) [ci skip] * New translations simple_form.en.yml (Silesian) [ci skip] * New translations activerecord.en.yml (Silesian) [ci skip] * New translations devise.en.yml (Silesian) [ci skip] * New translations doorkeeper.en.yml (Silesian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Russian) [ci skip] * i18n-tasks normalize * yarn manage:translations
2020-07-01Fix the conditions for incomplete remote content (#14195)Takeshi Umeda
2020-07-01Merge branch 'glitch' into mainStarfall
2020-07-01fix ol margin issueStarfall
2020-07-01[Glitch] Fix cursor type in statusesAriel
Port e9ea960773ee6a1068623374b21d768918fbc93b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-01[Glitch] Fix lock icon not being shown when locking account in profile settingsThibG
Port 4babf5b8b5ba8eca5a14f3b2813775240db8f8f1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.
2020-07-01Merge branch 'glitch' into mainStarfall
2020-07-01Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)Eugen Rochko
2020-07-01Fix cursor type in statuses (#14185)Ariel
2020-07-01Fix lock icon not being shown when locking account in profile settings (#14190)ThibG
2020-07-01Change move handler to carry blocks over (#14144)ThibG
* Change move handler to carry blocks and mutes over When user A blocks user B and B moves to a new account C, make A block C accordingly. Note that it only works if A's instance is aware of the Move, that is, if B is on A's instance or has followers there. * Also notify instances with known people blocking you when moving * Add automatic account notes when blocking/muting an account that had no note
2020-07-01follow-up #14149 (#14192)mayaeh
ran `yarn manage:translations en`
2020-07-01Add support for li attribute to li elementThibaut Girka
2020-07-01Add support for “start” and “reversed” attributes to ol elementThibaut Girka
Fixes #1367
2020-06-30Fix remote files not using Content-Type header, streaming (#14184)Eugen Rochko
2020-06-30[Glitch] Add user notes on accountsThibG
Port 65506bac3f3fe233b5b7b3241020bd74eb5c9259 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30[Glitch] Fix padding on account headertrwnh
Port d1c6dd2d277fee0cf65b480adc868c69df952622 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30[Glitch] Fix read marker state not being udpated internallyThibG
Port fa4876a1b93d4bb62038cca75bd5017fe49b59ae to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-30[Glitch] Change sensitive preview cards to not blur textThibG
Port a1ad2ad9519fda525858ba5aef86815a6f6385f2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>