about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2021-02-21Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-02-12[Glitch] Add dropdown for boost privacy in boost confirmation modalClaire
Port 07b46cb332ae197584e3ed3f23fe814b7793ec4c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12Refactor privacy dropdown to have an interface closer to upstream'sClaire
2021-02-12[Glitch] Fixed WebUI crash when a status opened in the media modal is deletedkaias1jp
Port 08ae116dc62c51988e9710b4f0cc9fdb2e9557b9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12[Glitch] Use custom mascot on static share pageJeong Arm
Port d499bb031f0d20a5f27facfd57cf4e00f89003d7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12[Glitch] Slightly reorder three dots menu on toots to make it more intuitiveMélanie Chauvel
Port f5fefdc11aee24626d78480766fda878911f58b7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12[Glitch] Change max. image dimensions to 1920x1080px (1080p)Eugen Rochko
Port acf1842896682674d9ab4d0f87ec04c6174468fa to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.
2021-02-12Refactor Api::Web::SettingsController (#15717)Eugen Rochko
2021-02-12Fix YouTube embeds failing due to YouTube serving wrong OEmbed URLs (#15716)Eugen Rochko
2021-02-11Fixed WebUI crash when a status opened in the media modal is deleted (#15701)kaias1jp
* Fixed picture in picture compatibility error in WebUI when status is deleted * Revert "Fixed picture in picture compatibility error in WebUI when status is deleted" This reverts commit f003b7d9d88688e9504f7dfae1545d7522fcfd98. * Close the modal display of the image when status is deleted * Fixed the case statement before the default statement * Removed unnecessary parts
2021-02-11fix typo (#15705)Takeshi Umeda
2021-02-11Onion service related changes to HTTPS handling (#15560)Cecylia Bocovich
* Enable secure cookie flag for https only * Disable force_ssl for .onion hosts only Co-authored-by: Aiden McClelland <me@drbonez.dev>
2021-02-11Use custom mascot on static share page (#15687)Jeong Arm
* Use custom mascot on static share page * Use full_asset_url
2021-02-11Fix URI of repeat follow requests not being recorded (#15662)Claire
* Fix URI of repeat follow requests not being recorded In case we receive a “repeat” or “duplicate” follow request, we automatically fast-forward the accept with the latest received Activity `id`, but we don't record it. In general, a “repeat” or “duplicate” follow request may happen if for some reason (e.g. inconsistent handling of Block or Undo Accept activities, an instance being brought back up from the dead, etc.) the local instance thought the remote actor were following them while the remote actor thought otherwise. In those cases, the remote instance does not know about the older Follow activity `id`, so keeping that record serves no purpose, but knowing the most recent one is useful if the remote implementation at some point refers to it by `id` without inlining it. * Add tests
2021-02-11Slightly reorder three dots menu on toots to make it more intuitive (#15647)Mélanie Chauvel
* Slightly reorder three dots menu on toots to make it more intuitive - Make “Pin to profile” always appear at the same place - Add separator to group “Bookmark” and “Pin to profile” - Fix separator being the first item in some cases * Fix missing semicolon and keep status_action_bar.js and action_bar.js in sync
2021-02-11Add dropdown for boost privacy in boost confirmation modal (#15704)Claire
* Various dropdown code quality fixes * Prepare support for privacy selection in boost modal * Add dropdown for boost privacy in boost confirmation modal
2021-02-10Fix background color for favourite modal on DMsClaire
2021-02-09Create instance actor if it hasn't been properly seeded (#15693)Claire
An uncommon but somewhat difficult to digagnose issue is dealing with improperly-seeded databases. In such cases, instance-signed fetches will fail with a ActiveRecord::RecordNotFound error, usually caught and handled as generic 404, leading people to think the remote resource itself has not been found, while it's the local instance actor that does not exist. This commit changes the code so that failure to find the instance actor automatically creates a new one, so that improperly-seeded databases do not cause any issue.
2021-02-09Change max. image dimensions to 1920x1080px (1080p) (#15690)Eugen Rochko
* Change max. image size to 1920x1080px * Change it in web UI too
2021-02-08Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-02-03[Glitch] Change custom emoji to be animated when hovering containerThibG
Port 3efa0c54b6656fba189baab0857e60c0bc4f3c7d to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-02-02Fix race conditions on account migration creation (#15597)ThibG
* Atomically check for processing lock in Move handler * Prevent race condition when creating account migrations Fixes #15595 * Add tests Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-31Change custom emoji to be animated when hovering container (#15637)ThibG
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-31Improved performance of notification preloading (#15640)abcang
* Improved performance of notification preloading * Remove Cacheable from Notification * Fix test
2021-01-31Fix N+1 query when rendering with StatusSerializer (#15641)abcang
2021-01-28Fix react/jsx-no-duplicate-props (#15636)abcang
2021-01-26Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-01-26Merge pull request #1491 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2021-01-26Support customizing poll option limitsleo60228
2021-01-26[Glitch] Add “translate” class to other user stringsThibG
Port 5fcac81302ad323a86ab43243c242c4a10cd338a to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
2021-01-25Fix first return value of FetchLinkCardService.html method (#15630)Takeshi Umeda
2021-01-22Use Enumerable#filter_map in more places (#15527)luigi
2021-01-22Add “translate” class to other user strings (#15611)ThibG
* Add “translate” class to other user strings Follow-up to #15610. Allow Google Translate to work on more user content: - poll options - reply indicator (contents of the status being replied to) - directory account cards - account note in follow requests list * Fix incorrect styling of account bio Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-22Optimize some regex matching (#15528)luigi
* Use Regex#match? * Replace =~ too * Avoid to call match? from Nil * Keep value of Regexp.last_match
2021-01-21[Glitch] Fix Google Translate breaking web interfaceThibG
Port 7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-01-21Fix Google Translate breaking web interface (#15610)ThibG
- marks the page as a whole as untranslatable - still marks user text as translatable Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-21Fix sign-up restrictions based on IP addresses not being enforced (#15607)ThibG
Fixes #15606 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-19Fix /activity endpoint not require signature in authorized fetch mode (#15592)ThibG
Fixes #15589 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-18Merge branch 'master' into glitch-soc/merge-upstreamClaire
2021-01-13Merge branch 'glitch' into mainStarfall
2021-01-12Use Rails' index_by where it makes sense (#15542)ThibG
* Use Rails' index_by where it makes sense * Fix tests Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-12Fix processing of incoming Block activities (#15546)ThibG
Unlike locally-issued blocks, they weren't clearing follow relationships in both directions, follow requests or notifications. Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-11[Glitch] Fix OCR lang data failing to loadThibG
Port 73ddb60c32090c9685f3b74e0bbb4a06b34a7083 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-11Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.
2021-01-10Fix muting users with duration via the REST api (#15516)Levi Bard
2021-01-10Optimize map { ... }.compact calls (#15513)luigi
* Optimize map { ... }.compact using Enumerable#filter_map, supported since Ruby 2.7 * Add poyfill for Enumerable#filter_map
generated by cgit-pink (git 2.37.1) at 2024-07-07 14:37:20 +0000