e4f8679eae
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
New setting added upstream. Ported it.
3 years ago
8485c436d5
Bump max supported schema version in maintenance script ( #15349 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
1f564051b6
Change RTL detection to rely on unicode-bidi paragraph by paragraph ( #14573 )
3 years ago
1045549f85
Add stoplight for object storage failures, return HTTP 503 ( #13043 )
3 years ago
75d2762fdf
Add "invite request content" display in user account admin page ( #15265 )
...
* 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
3 years ago
1390cc194b
Add indication to admin UI of whether a report has been forwarded ( #13237 )
...
* 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>
3 years ago
7c800fa801
Bump ini from 1.3.5 to 1.3.7 ( #15317 )
...
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>
3 years ago
a2ef002214
Fix to isolate the sidekiq process that runs the scheduler job ( #15314 )
3 years ago
9342705e6b
Add app shortcuts ( #15234 )
...
* 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>
3 years ago
1978f7265e
Fix processing of Delete activities on direct messages
3 years ago
47e507fa61
Add ability to require invite request text ( #15326 )
...
Fixes #15273
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
a7e819b8a8
Fix dynamic updating of “Bootstrap timeline accounts” admin setting ( #15325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
4fd3062003
Change "Profile unavailable" string to "Account suspended" in web UI ( #15345 )
3 years ago
216b85b053
Fix performance on instances list in admin UI ( #15282 )
...
- Reduce duplicate queries
- Remove n+1 queries
- Add accounts count to detailed view
- Add separate action log entry for updating existing domain blocks
3 years ago
a3b5675aa8
Change number format on about page from full to shortened ( #15327 )
3 years ago
4acb5c90a2
Use “public.js” pack for auth pages for form validation helpers
3 years ago
cbe9b0640b
Merge pull request #1473 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
9a5825f864
[Glitch] Add honeypot fields and minimum fill-out time for sign-up form
...
Port 49eb4d4ddf
3 years ago
237025b5ef
[Glitch] Fix notifications being unnecessarily redrawn on state change
...
Port 9669167aae
3 years ago
7782e4dc0d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/about_controller.rb`:
Minor conflict caused by glitch-soc's theming system.
Ported upstream changes.
3 years ago
49eb4d4ddf
Add honeypot fields and minimum fill-out time for sign-up form ( #15276 )
...
* 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>
3 years ago
9669167aae
Fix notifications being unnecessarily redrawn on state change ( #15312 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
b27d11dd33
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
7d0e45a3be
[Glitch] Fix column swiping animation logic
...
Port 0b437325dc
3 years ago
e18f9f8228
[Glitch] Fix unnecessary re-rendering of various components when typing in web UI
...
Partially port 9620ee90be
3 years ago
3449ffa133
[Glitch] rename replies_policy enumerables
...
Port front-end changes from 127c543a6e
3 years ago
b5134595d8
[Glitch] Fix alert when failing to save timeline markers in web UI
...
Port 59d943e152
3 years ago
a16175645d
Merge branch 'master' into glitch-soc/merge-upstream
3 years ago
127c543a6e
rename replies_policy enumerables ( #15304 )
3 years ago
f379a52d74
Fix missing pictureInPicture prop in detailed status container ( #15309 )
3 years ago
7aee364795
Fix open media hotkey ( #15308 )
...
* Fix open media hotkey
* Update status.js
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
3 years ago
765626a3a7
Fix the Open handler for PreviewCard ( #15305 )
3 years ago
0b437325dc
Fix column swiping animation logic ( #15301 )
...
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>
3 years ago
9620ee90be
Fix unnecessary re-rendering of various components when typing in web UI ( #15286 )
3 years ago
48bef17cc9
Fix slow distinct queries where grouped queries are faster ( #15287 )
...
About 2x speed-up on inboxes query
3 years ago
a8c471fcc0
Fix not being able to open audio modal in web UI ( #15283 )
...
Fix #15280
Also adds the new action bar and blurhash-based background
color to audio and video modals
3 years ago
59d943e152
Fix alert when failing to save timeline markers in web UI ( #15285 )
...
Fix #15267
3 years ago
014733d1e4
Fix too low contrast on new media modal background in web UI ( #15284 )
...
Fix #15258
3 years ago
17a2e27641
Fix remove number sign from account_featured_tags ( #15277 )
3 years ago
25f725d67a
Merge pull request #1470 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
40e2de3904
[Glitch] Fix character count not ignoring hidden CW field
...
Port 68775b6039
3 years ago
f8d867bac4
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
3 years ago
13df125b6c
Add favourite modal to light theme CSS
3 years ago
44d5c6bc8f
Fix incorrect conditions for suspended accounts in Get API for account featured tags ( #15270 )
3 years ago
fbe7519243
Fix account merging in maintenance script ( #15264 )
...
Also include AccountNote and AccountDeletionRequest to the list of classes
needing to be reassigned the merged account.
3 years ago
d849aad852
Change public thread view to hide "Show thread" link ( #15266 )
...
Fixes #15262
3 years ago
9136be480f
Fix followers hash cache not being invalidated on account merge ( #15256 )
...
Also clear relationships cache.
3 years ago
fbff89be03
Fix tootctl ip_blocks add failing if not given a comment ( #15263 )
...
Fixes #15261
3 years ago
4b7f21a28e
Fix Gemfile.lock breaking CI ( #15257 )
...
Unnecessary Ruby and Bundler version constraints got included in #15230
3 years ago
17f01ecc4e
Fix changelog containing items from 3.2.1 twice ( #15255 )
3 years ago
Claire