about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2020-06-24[Glitch] Fix modifier key to keep the EmojiPicker on macOSTakeshi Umeda
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24[Glitch] Fix unnecessary gap under of video modalfuyu
Port cb3c6d17804da67d3c0ff233a9ca1c1902f6926f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.
2020-06-24Fix audio/video/images/cards not reacting to window resizes in web UI (#14130)Eugen Rochko
* Fix audio/video/images/cards not reacting to window resizes in web UI * Update app/javascript/mastodon/features/audio/index.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-06-23Fix very wide media attachments resulting in too thin a thumbnail (#14127)ThibG
Fixes #14094
2020-06-23Fix crash in MergeWorker (#14129)ThibG
Similarly to #12324, the code is passing an Account object where an id is expected.
2020-06-23Simplify filtering conditionThibaut Girka
2020-06-23never filter own posts from timelineash lea
2020-06-23never filter own posts from timeline (#14128)ThibG
Signed-off-by: Thibaut Girka <thib@sitedethib.com> Co-authored-by: ash lea <example@thisismyactual.email>
2020-06-23Change volume control and download buttons in web UI (#14122)Eugen Rochko
* Fix audio download button not starting download in web UI * Fix volume controls on audio and video players in web UI * Remove download button from video player in web UI
2020-06-22Fix audio player not working when media files are hosted on a different ↵ThibG
domain (#14118)
2020-06-21Change design of audio players in web UI (#14095)Eugen Rochko
2020-06-20Fix modifier key to keep the EmojiPicker on macOS (#14096)Takeshi Umeda
2020-06-20Fix unnecessary gap under of video modal (#14098)fuyu
2020-06-20Fix not working I18n on 2FA and Sign in token page (#14087)fuyu
2020-06-19Merge branch 'glitch' into mainStarfall
2020-06-19Fix functional user requirements in whitelist mode (#14093)ThibG
Fixes #14092
2020-06-17[Glitch] Add hints about incomplete remote content to web UIEugen Rochko
Port 3e9dc4044bb7e1ef6131fbd6430ed85b3cc2fcfa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17[Glitch] Fix initial audio volume not corresponding to what's displayedThibG
Port 755e8c76ab28a99905c66082757d892939e70c49 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17[Glitch] Fixed emoji detection problem to append borderfuyu
Port b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc Co-authored-by: ThibG <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency
2020-06-15Fix initial audio volume not corresponding to what's displayed (#14057)ThibG
2020-06-14Add hints about incomplete remote content to web UI (#14031)Eugen Rochko
2020-06-10Fixed emoji detection problem to append border (#14020)fuyu
* Fixed emoji detection problem to append border * Add tests * Add missing semicolon * Fixed wrong result when includes different variation selector * Add missing semicolon * Remove grapheme-splitter and Change emoji list to array from string * Update comment * Remove spaces Co-authored-by: ThibG <thib@sitedethib.com>
2020-06-10Fix TL sometimes jumping when closing modals (#14019)ThibG
Fixes #14018
2020-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09Fix WebUI crash when processing accounts before page is loaded (#14015)ThibG
2020-06-09[Glitch] Fix WebUI crash when loading account data before page is loadedThibaut Girka
2020-06-09[Glitch] Add hotkey for toggling content warning composer fieldThibG
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-09[Glitch] Improve rendering of emoji which do not contrast with backgroundThibG
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] FIX: filters ignore media descriptionsBen Lubar
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Hide sensitive preview cards with blurhashThibG
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09[Glitch] Fix ref attr for react-textarea-autozsizeYamagishi Kazutoshi
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
2020-06-09Add hotkey for toggling content warning composer field (#13987)ThibG
2020-06-09Make domain block/silence/reject-media code more robust (#13424)ThibG
* Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.
2020-06-09Update “status” to “toot” for en.json (#13877)Bei Li
2020-06-09Improve rendering of emoji which do not contrast with background (#13772)ThibG
* Refactor list of emoji requiring added outlines so that it can be theme-specific * Split inaccessible emoji to emoji requiring an outline and ones that can be inverted * Drop the “silouhettes” from black emoji as they seem to have changed color * Add inaccessible emojis list for the light theme * Use bordered emoji variant instead of unreliable CSS
2020-06-09Improve wording and add titles on moderated servers section in /about/more ↵Mélanie Chauvel
(#13930)
2020-06-09Fix performance of follow import (#13836)Takeshi Umeda
2020-06-09Add e-mail-based sign in challenge for users with disabled 2FA (#14013)Eugen Rochko
2020-06-09Add limit parameter to rss (#13743)Takeshi Umeda
2020-06-09Add visibility parameter in share page (#13023)Takeshi Umeda
* Add visibility parameter in share page * Restrict to default privacy
2020-06-09FIX: filters ignore media descriptions (#13837)Ben Lubar
* FIX: filters ignore media descriptions * remove parentheses to make codeclimate happy * combine the text and run the regular expression only once. https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581 * Fix use of “filter” instead of “compact”, fix coding style issues Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-06-06Hide sensitive preview cards with blurhash (#13985)ThibG
* Use preview card blurhash in WebUI * Handle sensitive preview cards
2020-06-05Add blurhash to preview cards (#13984)ThibG
Fixes #13001
2020-06-05Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)ThibG
* Display appropriate error when performing unpermitted operation on custom emoji Fixes #13897 * Remove links to custom emoji actions not performable by moderators
2020-06-04Fix serialization of replies when some of them are URIs (#13957)ThibG
* Fix serialization of replies when some of them are URIs Fixes #13956 * Add test
2020-06-03Fix wrong route helper in encrypted messages controller (#13952)Eugen Rochko
And add `created_at` to encrypted message serializer
generated by cgit-pink (git 2.37.1) at 2024-12-28 19:49:19 +0000