Age | Commit message (Collapse) | Author |
|
|
|
Port 55ac2b9c6085def9e692fa69b849239c1249d9fd to glitch-soc
|
|
|
|
Fixes #15133
|
|
|
|
Port 65db2625508c220fd3c0a1f37cdd2e13b6e02987 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a8139ab0160096d09d83e8d3f9c7849129be1aa8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 0635c8760dfdfeb3d763f1d1ae6cf5a208b29b6c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
* 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
|
|
|
|
Fixes #14910
|
|
Port 2127f40e6bf6deab62f48030263c459d14fed364 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port SCSS changes from 8331fdf7e0ea85ecc6d7dbff00b784bb6aa1f7d4 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
|
|
Port 07b46cb332ae197584e3ed3f23fe814b7793ec4c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 08ae116dc62c51988e9710b4f0cc9fdb2e9557b9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port d499bb031f0d20a5f27facfd57cf4e00f89003d7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port f5fefdc11aee24626d78480766fda878911f58b7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port acf1842896682674d9ab4d0f87ec04c6174468fa to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
* 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
|
|
|
|
* Use custom mascot on static share page
* Use full_asset_url
|
|
* 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
|
|
* Various dropdown code quality fixes
* Prepare support for privacy selection in boost modal
* Add dropdown for boost privacy in boost confirmation modal
|
|
|
|
* Change max. image size to 1920x1080px
* Change it in web UI too
|
|
Port 3efa0c54b6656fba189baab0857e60c0bc4f3c7d to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 5fcac81302ad323a86ab43243c242c4a10cd338a to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `CONTRIBUTING.md`:
Not a real conflict, glitch-soc quotes the upstream file, which has been
changed. Update the quote.
|
|
* 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>
|
|
Port 7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
- marks the page as a whole as untranslatable
- still marks user text as translatable
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 73ddb60c32090c9685f3b74e0bbb4a06b34a7083 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 3f4b0dfd47d35818b36fedb767a5a82dc02f87cc to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ba748a83f2050dff27758bce67c05d37a8b7d8f3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
clickable in Safari
Port e38874dcf7b0fca0f9934fcd0e12bba457c7c212 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port a50fe47a77118dba043143c01d0d6ad6c82f9b31 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 71f09688878241f0a47fd637047afbf0148f0abf to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|