about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-12-15Add "invite request content" display in user account admin page (#15265)Mashiro
* feat: display `invite_request_text` in admin's user account page * fix: move invite_request to the bottom of accounts page * fix: remove time display, remove formate, change code terminology * fix: remove escape
2020-12-15Add indication to admin UI of whether a report has been forwarded (#13237)ThibG
* Add indication to admin UI of whether a report has been forwarded * Rework how forwarded status is displayed Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-15Bump ini from 1.3.5 to 1.3.7 (#15317)dependabot[bot]
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-15Fix to isolate the sidekiq process that runs the scheduler job (#15314)Takeshi Umeda
2020-12-15Add app shortcuts (#15234)Marcin Mikołajczak
* Add app shortcuts Signed-off-by: mkljczk <me@mkljczk.pl> * Fix codeclimate issues Signed-off-by: mkljczk <me@mkljczk.pl> * Change shortcuts Signed-off-by: mkljczk <me@mkljczk.pl> * More consistent new-status icon Signed-off-by: mkljczk <me@mkljczk.pl>
2020-12-14Fix processing of Delete activities on direct messagesClaire
2020-12-14Add ability to require invite request text (#15326)ThibG
Fixes #15273 Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-14Fix dynamic updating of “Bootstrap timeline accounts” admin setting (#15325)ThibG
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-14Change "Profile unavailable" string to "Account suspended" in web UI (#15345)Eugen Rochko
2020-12-14Fix performance on instances list in admin UI (#15282)Eugen Rochko
- Reduce duplicate queries - Remove n+1 queries - Add accounts count to detailed view - Add separate action log entry for updating existing domain blocks
2020-12-14Change number format on about page from full to shortened (#15327)Eugen Rochko
2020-12-10Merge branch 'glitch' into mainStarfall
2020-12-10Use “public.js” pack for auth pages for form validation helpersClaire
2020-12-10Merge pull request #1473 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-12-10[Glitch] Add honeypot fields and minimum fill-out time for sign-up formThibG
Port 49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-10[Glitch] Fix notifications being unnecessarily redrawn on state changeThibG
Port 9669167aaeaa834dcc99fa7df961c4f9b8118850 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-10Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.
2020-12-10Add honeypot fields and minimum fill-out time for sign-up form (#15276)ThibG
* Add honeypot fields to limit non-specialized spam Add two honeypot fields: a fake website input and a fake password confirmation one. The label/placeholder/aria-label tells not to fill them, and they are hidden in CSS, so legitimate users should not fall into these. This should cut down on some non-Mastodon-specific spambots. * Require a 3 seconds delay before submitting the registration form * Fix tests * Move registration form time check to model validation * Give people a chance to clear the honeypot fields * Refactor honeypot translation strings Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09Fix notifications being unnecessarily redrawn on state change (#15312)ThibG
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09Merge pull request #1472 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-12-09[Glitch] Fix column swiping animation logicThibG
Port 0b437325dc93a1d28202b5ff30eaafc9b4e571b7 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09[Glitch] Fix unnecessary re-rendering of various components when typing in ↵Eugen Rochko
web UI Partially port 9620ee90be7e04b3616ce4b851abb63dbba7af7f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09[Glitch] rename replies_policy enumerablestrwnh
Port front-end changes from 127c543a6e59d20de68e6760e952d18ed53578e9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09[Glitch] Fix alert when failing to save timeline markers in web UIEugen Rochko
Port 59d943e152a36c693eddd6a6a3c1d9c956dba07b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-09Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-09rename replies_policy enumerables (#15304)trwnh
2020-12-09Fix missing pictureInPicture prop in detailed status container (#15309)Takeshi Umeda
2020-12-09Fix open media hotkey (#15308)Jeong Arm
* Fix open media hotkey * Update status.js Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-12-08Fix the Open handler for PreviewCard (#15305)Takeshi Umeda
2020-12-07Fix column swiping animation logic (#15301)ThibG
From the start, swiping columns was highly unreliable because the logic could change `ReactSwipeableViews`'s `animateTransitions` property mid-swipe. PR #11200 partially fixed this, but at the unintended cost of disabling the swipe animation altogether. This PR changes the logic behind `shouldAnimate` to only disable the swiping animation at the end of a column change not initiated by `ReactSwipeableViews`. Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-07Fix unnecessary re-rendering of various components when typing in web UI ↵Eugen Rochko
(#15286)
2020-12-07Merge remote-tracking branch 'vanilla/master' into mainStarfall
2020-12-07Merge branch 'glitch' into mainStarfall
2020-12-07Fix slow distinct queries where grouped queries are faster (#15287)Eugen Rochko
About 2x speed-up on inboxes query
2020-12-07Fix not being able to open audio modal in web UI (#15283)Eugen Rochko
Fix #15280 Also adds the new action bar and blurhash-based background color to audio and video modals
2020-12-07Fix alert when failing to save timeline markers in web UI (#15285)Eugen Rochko
Fix #15267
2020-12-07Fix too low contrast on new media modal background in web UI (#15284)Eugen Rochko
Fix #15258
2020-12-06Fix remove number sign from account_featured_tags (#15277)Takeshi Umeda
2020-12-05Merge pull request #1470 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-12-05[Glitch] Fix character count not ignoring hidden CW fieldMélanie Chauvel
Port 68775b60392152d32deda45a261bc1d4f848b44a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-05Merge branch 'master' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.
2020-12-05Add favourite modal to light theme CSSStarfall
2020-12-04Fix incorrect conditions for suspended accounts in Get API for account ↵Takeshi Umeda
featured tags (#15270)
2020-12-04Fix account merging in maintenance script (#15264)ThibG
Also include AccountNote and AccountDeletionRequest to the list of classes needing to be reassigned the merged account.
2020-12-03Add favourite modal to light theme CSSStarfall
2020-12-02Change public thread view to hide "Show thread" link (#15266)ThibG
Fixes #15262
2020-12-02Fix followers hash cache not being invalidated on account merge (#15256)ThibG
Also clear relationships cache.
2020-12-02Fix tootctl ip_blocks add failing if not given a comment (#15263)ThibG
Fixes #15261
2020-12-01Merge branch 'glitch' into mainStarfall
2020-12-01Fix Gemfile.lock breaking CI (#15257)ThibG
Unnecessary Ruby and Bundler version constraints got included in #15230
generated by cgit-pink (git 2.37.1) at 2024-07-21 21:23:46 +0000