about summary refs log tree commit diff
path: root/app/javascript/mastodon/features
AgeCommit message (Collapse)Author
2021-06-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.
2021-06-27Fix #16407 (#16432)David Sterry
2021-06-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `Gemfile.lock`: upstream-updated dependency (redis) textually too close to glitch-specific one (redcarpet). Ported upstream change.
2021-06-15Fix OCR failure when erroneous lang data is in cache (#16386)Claire
Fixes #15472 If the Tesseract worker fails at any point, re-try with cache settings that overwrite the cache. It is difficult to catch more precise errors as those are pretty opaque and do not occur when loading lang data but when trying to detect text.
2021-06-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-03Update emoji codepoint mappings to v13.1 (#16352)Claire
2021-06-01Add assets from Twemoji 13.1.0 (#16345)Eugen Rochko
* Add assets from Twemoji 13.1.0 * Update emoji-mart
2021-05-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-05-19Fix unread notification count when polling (#16272)Claire
* Fix unread notification count when polling Fixes #16236 * Immediately fetch markers to avoid incorrect unread notification count
2021-05-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-05-11Fix follow recommendations UI in advanced layout (#16215)Claire
2021-05-11Fix dialog close button (#16219)Mélanie Chauvel
* Fix dialog close button being white on almost white * Make dialog close button slightly bigger
2021-05-11Fix eslint error (#16212)abcang
2021-05-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
- `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.
2021-05-07Change home timeline to reload after follow recommendations in web UI (#16160)Eugen Rochko
2021-05-07Add joined date to profiles in web UI (#16169)Eugen Rochko
2021-05-06Fix "You might be interested in" flashing while searching in web UI (#16162)Eugen Rochko
2021-05-05Add empty state message for follow recommendations in web UI (#16161)Eugen Rochko
2021-04-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-04-20Hide floating action button on onboarding page (#16082)Claire
2021-04-20Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.
2021-04-20Fix newlines not being considered sentence separators in account note (#16079)Eugen Rochko
Also bullets
2021-04-19Change onboarding by replacing tutorial with follow recommendations in web ↵Eugen Rochko
UI (#16060)
2021-04-16Fix not to show follow button in global suggestion (#16045)Takeshi Umeda
* Fix not to show follow button in global suggestion * Fix style
2021-04-13Add border to 🚲 emoji (#16035)Claire
2021-04-12Add cold-start follow recommendations (#15945)Eugen Rochko
2021-04-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-04-01Fix crash in old browsers (#15985)Claire
Fixes #15984
2021-03-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-24Fix compose form behavior in mobile view (#15555)Claire
* Fix ComposeForm being mounted twice in mobile view Fixes #13094 * Fix compose form focus and pre-selection behavior in mobile view * Split _updateFocusAndSelection out of componentDidUpdate
2021-03-22Bump react-select from 3.2.0 to 4.0.2 (#15624)dependabot[bot]
* Bump react-select from 3.2.0 to 4.0.2 Bumps [react-select](https://github.com/JedWatson/react-select) from 3.2.0 to 4.0.2. - [Release notes](https://github.com/JedWatson/react-select/releases) - [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2) Signed-off-by: dependabot[bot] <support@github.com> * Add cacheKey to NonceProvider for react-select Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-03-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-19Add option to opt out of unread notification markers (#15842)Claire
Fixes #15133
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-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-11fix typo (#15705)Takeshi Umeda
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-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-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-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-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-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.
generated by cgit-pink (git 2.37.1) at 2024-06-28 15:52:11 +0000