about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
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
2020-06-03Put “Add new domain block” button on /admin/instances in header (#13934)Mélanie Chauvel
2020-06-03Fix account redirect confirmation message talking about moved followers (#13950)ThibG
Fixes #13949
2020-06-03Fix activity not being signed (#13948)Takeshi Umeda
2020-06-02Add E2EE API (#13820)Eugen Rochko
2020-06-02Fix ref attr for react-textarea-autozsize (#13936)Yamagishi Kazutoshi
2020-06-01[Glitch] Adjust flash alert contrast for better readabilityChristopher Choi
Port b4a8400afd88a2ae8822757e5d30975494be2512 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-01[Glitch] Allow Ctrl-click to keep EmojiPicker window openBrian C. Lindner
Port 64154c5161d4d5c82877fba549d72068cc7f9e16 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-06-01Improve appearance of notification cleaning UIariasuni
- Use smaller font-size for consistency with the rest of the UI - Make better use of the horizontal space when available
2020-06-01Fix admin page crashing when trying to block an invalid domain name (#13884)ThibG
* Fix admin page crashing when trying to block an invalid domain name Fixes #13880 * Fix trailing and leading spaces not being properly stripped for domain blocks
2020-05-31Fix unsent toot confirmation dialog not popping up in single column (#13888)ThibG
2020-05-31Adjust flash alert contrast for better readability (#13892)Christopher Choi
2020-05-31Allow Ctrl-click to keep EmojiPicker window open (#13896)Brian C. Lindner
2020-05-31Hide local-only pinned toots from public profilesThibaut Girka
Fixes #1336 This also fixes federating pinned toots when some of them are local-only. Public profiles will not show public toots, whether you are logged in or not (this is consistent with local-only toots that are not pinned).
2020-05-30Fix backup archive including outgoing-only content warningsThibaut Girka
2020-05-30Add support for setting Content Warning for CW-less outgoing tootsThibaut Girka
2020-05-29[Glitch] Fix timeline markers in FirefoxThibG
Port cc650bc023e00d07c5796b7602d86597bb437f45 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29[Glitch] Fix timeline markers not working on ChromeThibG
Port 5aff2a6957e861162d67c4610277e9bb2a6f8186 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-29Fix timeline markers in Firefox (regression from #13887) (#13889)ThibG
Unfortunately, Firefox does not support the `keepalive` parameter I used in the previous PR. However it supports the `navigator.sendBeacon` API that allows that kind of things, but does not allow setting headers. Therefore, this PR replaces it with a `sendBeacon` call that passes the bearer token in the POST data. Doorkeeper will then handle the auth token out of the box, as long as it is passed as form data. Passing the query as JSON does not work.
2020-05-29Fix timeline markers not working on Chrome (#13887)ThibG
* Periodically save timeline markers This saves timeline markers immediately upon message arrival, but not more than once every 5 minutes. This does not change how the markers are saved on closing the window, except that it avoids submitting them if there is no need for it. * Use the Fetch API when possible instead of XHR on window unload
2020-05-28Fix local-only hashtag columnsThibaut Girka
2020-05-28Fix one import being made on mastodon's codebase instead of glitch-soc'sThibaut Girka
2020-05-28[Glitch] Change wording from “Hide media” to “Hide image/images” in ↵Mélanie Chauvel
Web UI Port 40d81620b00f6c4ed30b78f95b443a08e62ae8fa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28[Glitch] Fix local streaming of hashtag timelinesTakeshi Umeda
Port 3a1a21ad5725bed7f82b516b4174272c1e931223 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-28Fix exception when trying to serialize posts with <a> tags in them without ↵Ben Lubar
hrefs (#1334) * fix exception when trying to serialize posts with <a> tags in them without hrefs * Add tests Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-05-26Fix Cmd-Enter not working to send tootThibaut Girka
Fixes #1333
2020-05-25Change wording from “Hide media” to “Hide image/images” in Web UI ↵Mélanie Chauvel
(#13834)