about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2022-01-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-01-16Fix admin interface crash when displaying deleted user (#17301)Claire
2022-01-16[Glitch] Gradually increase retry waiting for media processingJeong Arm
Port bc7a8ae6d6d2c2118e5c49add83539498b9d543b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.
2022-01-16Remove IP tracking columns from users table (#16409)Eugen Rochko
2022-01-10Gradually increase retry waiting for media processing (#17271)Jeong Arm
2022-01-07[Glitch] Fix media descriptions not being used for client-side filteringClaire
Port 37e80994f81bdb07e31f1a55cd37c967822a1a2a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-12-30Remove custom emojis on domain purge (#17210)Jeong Arm
2021-12-28Fix media descriptions not being used for client-side filtering (#17206)Claire
Fix oversight in #13837
2021-12-27[Glitch] Fix tag rendering error in hashtag column settingsRens Groothuijsen
Port e65080181af82c14d3441a0890f2ba0a6fb9cd7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-27Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream.
2021-12-27Fix warnings on Rails boot (#16946)Eugen Rochko
2021-12-26Fix tag rendering error in hashtag column settings (#17184)Rens Groothuijsen
* Flatten tags in configuration to regular array before converting to JSON * Render filter tags using toJS instead of toJSON
2021-12-21Fix duplicate record on admin/accounts when searching with IP (#17150)Jeong Arm
2021-12-18[Glitch] Change title of retention chartClaire
Port 0c17fd91091fd2f230224d5fce218688d480502c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-12-17Add ability for admins to delete canonical email blocks (#16644)Claire
* Add admin option to remove canonical email blocks from a deleted account * Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
2021-12-17Add ability to purge undeliverable domains from admin interface (#16686)Claire
* Add ability to purge undeliverable domains from admin interface * Add tests
2021-12-17Change title of retention chart (#16909)Claire
Changes from “Retention” to “User retention rate by month after sign-up”. This should make it much clearer to people not familiar with retention charts what it actually means.
2021-12-17Change list title input styling (#17092)Claire
2021-12-16[Glitch] ignore hashtag suggestions if they vary only in caseDavid Sterry
Port 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16[Glitch] Show correct error message if chosen password is too longRens Groothuijsen
Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16[Glitch] Add batch suspend for accounts in admin UIEugen Rochko
Port SCSS changes from 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.
2021-12-15ignore hashtag suggestions if they vary only in case (#16460)David Sterry
* ignore hashtag suggestions if they vary only in case * remove console.logs and unused args * consistently add space when dismissing suggestions * linting
2021-12-13Fix follow recommendation biased towards older accounts (#17126)Takeshi Umeda
2021-12-13Change trending hashtags threshold back from 15 to 5 (#17122)Eugen Rochko
2021-12-05Fix redirection when succeeded WebAuthn (#17098)heguro
2021-12-05Show correct error message if chosen password is too long (#17082)Rens Groothuijsen
* Add correct error message for exceeding max length on password confirmation field * Code style fixes
2021-12-05Add batch suspend for accounts in admin UI (#17009)Eugen Rochko
2021-12-03Fix unneeded outline around list name edition inputClaire
2021-11-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-11-29Fix error on trending mailer due to missing constant (#17072)Eugen Rochko
2021-11-28Fix server graph on admin/tags/:id (#17066)Jeong Arm
2021-11-26[Glitch] Fix searching for additional hashtags in hashtag columnClaire
Port 3f382e337d5c40db18995a88c0bf6b1b34f031b7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26[Glitch] Fix color of hashtag column settings inputsClaire
Port 1630807ee2517e7a9dbb66cbd532a0c46e01abcf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
2021-11-26Fix admin statuses order(#16937) (#16969)Jeong Arm
* Fix #16937 * Add test for statuses order
2021-11-26Fix searching for additional hashtags in hashtag column (#17054)Claire
2021-11-26Fix color of hashtag column settings inputs (#17058)Claire
Fixes #17057
2021-11-26Fix opening wrong profile when clicking on username of boosting user in ↵Claire
WebUI (#17060) Fixes #16799
2021-11-26[Glitch] Port upstream changes about trending linksJeong Arm
2021-11-26Remove Keybase integration (#17045)Eugen Rochko
2021-11-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-11-26Revert "Fix trends admin page crashing"Claire
This reverts commit 5f10e64330635bfd609ba5acdd78fa505c12f5b1.
2021-11-26Fix error on trending hashtags/links pages in admin UI due to missing ↵Eugen Rochko
constant (#17044)
2021-11-26Fix trends admin page crashingClaire
2021-11-25Disable trending links review request emailsClaire
2021-11-25[Glitch] Fix handling of recursive toots in WebUIClaire
Port b1fd6d44901a13450d22884b02eb6e9ae4fc1248 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>