about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
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-02-28Fix WebUI crashing when SVG support is disabled (#15809)Claire
Fixes #14910
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-21Add server rules (#15769)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-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-11Use custom mascot on static share page (#15687)Jeong Arm
* Use custom mascot on static share page * Use full_asset_url
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-09Change max. image dimensions to 1920x1080px (1080p) (#15690)Eugen Rochko
* Change max. image size to 1920x1080px * Change it in web UI too
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-01-31Change custom emoji to be animated when hovering container (#15637)ThibG
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-28Fix react/jsx-no-duplicate-props (#15636)abcang
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-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-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-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-09Fix OCR lang data failing to load (#15519)ThibG
Fixes #15472 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix logo button style moreTakeshi Umeda
Port 3f4b0dfd47d35818b36fedb767a5a82dc02f87cc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix logo button styleTakeshi Umeda
Port ba748a83f2050dff27758bce67c05d37a8b7d8f3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix getting-started footer in single column mode not being ↵Takeshi Umeda
clickable in Safari Port e38874dcf7b0fca0f9934fcd0e12bba457c7c212 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix defaultProps of frameRate to stringTakeshi Umeda
Port a50fe47a77118dba043143c01d0d6ad6c82f9b31 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06[Glitch] Fix missing key in list timeline policyTakeshi Umeda
Port 71f09688878241f0a47fd637047afbf0148f0abf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-01-06Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
2021-01-05Fix defaultProps of frameRate to string (#15493)Takeshi Umeda
2021-01-05Fix missing key in list timeline policy (#15494)Takeshi Umeda
2021-01-05Fix getting-started footer in single column mode not being clickable in ↵Takeshi Umeda
Safari (#15496)
2020-12-30Fix logo button style more (#15458)Takeshi Umeda
2020-12-30Fix expand video on public page (#15469)Takeshi Umeda
2020-12-26New Crowdin updates (#15413)Eugen Rochko
* 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.yml (Vietnamese) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations simple_form.en.yml (Armenian) [ci skip] * New translations devise.en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations devise.en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * i18n-tasks normalize * yarn manage:translations
2020-12-26Fix logo button style (#15428)Takeshi Umeda
* Fix bell button rtl style * Remove size and style props from button component * Fix logo button style * Update jest snapshot
2020-12-23Fix unfollow action button style (#15418)Takeshi Umeda