about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2021-08-20Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-08-11Fix crash if a notification contains an unprocessed media attachment (#16573)Claire
* Refactor AttachmentList * Do not crash if a notification contains an unprocessed media attachment Fixes #16530 * Fix spacing in compact form
2021-08-11Fix download button color in audio player (#16572)Claire
Fixes #16571
2021-08-09[Glitch] Fix logout link not working in safariTakeshi Umeda
Port b2875b1864d5bd72e6902ffc842d1be6818c210e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-09[Glitch] Fix trends layoutJeong Arm
Port 6e0ab6814f4d3906c035e10a9cedbc41ae5967e9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.
2021-08-06Add missing Korean translationsJeong Arm
2021-08-06Add Korean translationsJeong Arm
2021-08-06Fix logout link not working in safari (#16574)Takeshi Umeda
2021-08-05Fix trends layout (#16570)Jeong Arm
2021-07-31en-cafe: Clarify the "show more for all" buttonStarfall
Addresses mastodon/mastodon#16176
2021-07-31Always show follow requests link on single-column viewStarfall
Closes mastodon/mastodon#16178
2021-07-25[Glitch] Fix crashes with Microsoft Translate on Microsoft EdgeClaire
Port e9659ae0312d0bf0acf2b55eed5dc688929cae04 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25[Glitch] Add confirmation modal when closing media edit modal with unsaved ↵Claire
changes Port a8a7066e977cb0aa1988d340ef8b7c542f179b14 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25[Glitch] Fix “open” link of media modal not closing modalClaire
Port af08229ff43cf61b6b3eb386ca9d6205d05dc295 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-07-25Add confirmation modal when closing media edit modal with unsaved changes ↵Claire
(#16518) * Add confirmation modal when closing media edit modal with unsaved changes * Move focal point media state to redux so it does not get erased by confirmation dialog * Change upload modal behavior to keep it open while saving changes Instead of closing it immediately and losing changes if they fail to save… * Make it work with react-intl 2.9
2021-07-25Fix “open” link of media modal not closing modal (#16524)Claire
2021-07-23Fix crashes with Microsoft Translate on Microsoft Edge (#16525)Claire
Fixes #16509 Microsoft Edge with translation enabled rewrites the DOM in ways that confuse react and prevent it from working properly. Wrapping the offending parts in a span avoids this issue.
2021-07-17Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-07-17Fix replying from modal (#16516)Claire
Fixes #16515 Not using a router object somehow made `this.history` lag behind the real browser history whenever pushing a new history item in `replyCompose`. Not using the context-provided router in this case was an oversight made when porting glitch-soc changes in #16499.
2021-07-14Fix minor code quality issues (#16502)Claire
2021-07-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.
2021-07-13Change references to tootsuite/mastodon to mastodon/mastodon (#16491)Claire
* Change references to tootsuite/mastodon to mastodon/mastodon * Remove obsolete test fixture * Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG And a few other places
2021-07-13Improve modal flow and back button handling (#16499)Claire
* Refactor shouldUpdateScroll passing So far, shouldUpdateScroll has been manually passed down from the very top of the React component hierarchy even though it is a static function common to all ScrollContainer instances, so replaced that with a custom class extending ScrollContainer. * Generalize “press back to close modal” to any modal and to public pages * Fix boost confirmation modal closing media modal
2021-07-13Please CodeClimateClaire
2021-07-13Small scroll/history behavior fixup to take weird browser patterns into accountClaire
2021-07-13Refactor shouldUpdateScroll stuffClaire
2021-07-13Fix scroll handling with modalsClaire
2021-07-12Fix and simplify browser history handling in relation to modalsClaire
This simplifies the logic to: - when the last modal gets closed and we're in our history buffer state, go back - whenever a modal is open, ensure we're in a history buffer state by potentially pushing one
2021-07-12Add modal stack to allow better boost modal and media modal interaction.Claire
2021-07-12Fix clicking on the pop-up player placeholder expanding the clicked tootClaire
2021-07-12Fix follow suggestions scrolling on mobile viewClaire
Also simplify the CSS a bit and bring it closer to upstream.
2021-07-08[Glitch] Fix pop-in player display when poster has long username or handleClaire
Port 1381e0e1d9f27bd108d8b9349896f10ffe996cb2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-07-08Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.
2021-07-07Transition away from GitHub repositoryStarfall
* Change link footer and onboarding model to point to our personal Git repository and direct folks to email us for collaboration * Remove now-unnecessary .github folder and add it to .gitignore [I am not actually sure if this will prevent us from getting those files again in the future.] * Restore English locale to upstream version and move our changes into the en-cafe custom locale. * Remove most of the README for clarity. After GitHub's contract with ICE came to light, we moved our personal projects away from the site. With Copilot now effectively laundering code under free licenses through machine learning by claiming that training a model is "fair use" even when it directly quotes the input, it's clear now that making the effort to move our Mastodon fork off of GitHub is worth the effort. But even if the model *never* recited anyone's source, we consider it to be clearly unethical to use open source code in this way without a permissive license or written consent from the authors of any non-trivial contributions. Whether or not the law agrees, this is clearly a derivative work in the colloquial sense of the term. We needed to build our own CI/CD solution in the next week and a half anyway because Docker Hub is removing automatic builds from the free tier. We're under no illusions that moving to our personal Git host will actually stop anyone from doing whatever they want with what we post publicly on the Internet. But we're both sending a message and learning how to build our own infrastructure, which will hopefully be helpful to us in the future. You can read more about GitHub's ICE deals here: https://www.zdnet.com/article/microsoft-github-ceo-why-we-defend-ice-deal-in-the-face-of-employee-anger/ You can read about GitHub Copilot quoting source code, and the steps they've taken to reduce its frequency, here: https://docs.github.com/en/github/copilot/research-recitation
2021-07-07Merge branch 'glitch'Starfall
2021-07-05Fix pop-in player display when poster has long username or handle (#16468)Claire
2021-06-30[Glitch] Hide /about/more footer link in limited federation modeDavid Sterry
Port 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-25Fix styling of boost button in media modal not reflecting ability to boost ↵Claire
(#16387)
2021-06-25Fix WebUI crash when a toot with a playing video gets deleted (#16384)Claire
* Fix WebUI crash when a toot with a playing video gets deleted * Fix pop-up player not closing the moment a status is deleted
2021-06-24Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crashClaire
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
2021-06-24[Glitch] Fix styling of boost button in media modal not reflecting ability ↵Claire
to boost Port tootsuite#16387 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24Fix pop-up player not closing the moment a status is deletedClaire
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24Fix WebUI crash when a toot with a playing video gets deletedClaire
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-23[Glitch] Add authentication historyEugen Rochko
Port SCSS changes from d174d12c831989bf1d5d3ca54d4f26d28c2c8925 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-23Merge branch 'main' into glitch-soc/merge-upstreamClaire
generated by cgit-pink (git 2.37.1) at 2024-11-07 22:50:39 +0000