about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2021-04-02Merge commit '935e376078fa8716ea5475a45602301fd3d6b081'Starfall
2021-03-11Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/validators/status_length_validator.rb`: Conflict due to glitch-soc's configurable maximum toot chars. Ported upstream changes.
2021-03-07Fix some ignored brakeman warnings (#15829)Claire
2021-03-06Fix various CodeClimate warningsClaire
2021-03-04Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-03-04Fix URL scanning in note length validator and preview card fetching (#15827)Claire
* Add tests * Fix URL scanning in note length validator and preview card fetching
2021-03-02[Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character countingClaire
Port 65db2625508c220fd3c0a1f37cdd2e13b6e02987 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02[Glitch] Add borders to 📱 and 📲 emojisClaire
Port a8139ab0160096d09d83e8d3f9c7849129be1aa8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02[Glitch] Fix WebUI crashing when SVG support is disabledClaire
Port 0635c8760dfdfeb3d763f1d1ae6cf5a208b29b6c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-03-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.
2021-03-02Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)Claire
* Update twitter-text from 1.14 to 3.1.0 * Disable emoji parsing * Properly depend on twitter-text for url detection * Fix some URLs being wrongly detected client-side * Add test for server-side validation of non-autolinkable URLs * Fix server-side status length counting
2021-03-01Add borders to 📱 and 📲 emojis (#15794)Claire
2021-03-01Add `POST /api/v1/emails/confirmations` to REST API (#15816)Eugen Rochko
Only available to the application the user originally signed-up with
2021-03-01Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)Eugen Rochko
2021-02-28Fix WebUI crashing when SVG support is disabled (#15809)Claire
Fixes #14910
2021-02-26Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-02-26Fix crash on receiving requests with missing Digest header (#15782)Claire
* Fix crash on receiving requests with missing Digest header Return an error pointing out that Digest is missing, instead of crashing. Fixes #15743 * Fix from review feedback
2021-02-24Add inline description of moderation actions in moderation interface (#15792)Claire
2021-02-24Change ResolveAccountService's handling of skip_webfinger (#15750)Claire
* Change ResolveAccountService's handling of skip_webfinger Change it so it never makes any webfinger query, as the name would imply. * Add tests * Change FollowService to not take an URI for target_account * Restore domain-block check in FollowService * Fix tests
2021-02-22someone asked for one-option pollsStarfall
2021-02-22Fix server rules not being displayed if extended server discription isn't ↵Claire
set (#15778)
2021-02-22[Glitch] Fix default searchTokensabcang
Port 2127f40e6bf6deab62f48030263c459d14fed364 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-22[Glitch] Add server rulesEugen Rochko
Port SCSS changes from 8331fdf7e0ea85ecc6d7dbff00b784bb6aa1f7d4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-02-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-02-22Fix default searchTokens (#15775)abcang
2021-02-21Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-02-21Add server rules (#15769)Eugen Rochko
2021-02-19replace all instances of "ends_with?" with "end_with?" (#15745)Justin Tracey
The "ends_with?" method is just a Rails alias of Ruby's "end_with?" method. Using the latter makes the code less brittle.
2021-02-16Add `GET /api/v1/accounts/lookup` REST API (#15740)Eugen Rochko
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>