luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-06 23:14:57 +00:00
Code Issues Projects Releases Wiki Activity
13262 commits 1 branch 0 tags 248 MiB
Commit graph

13262 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThibG 47e507fa61
Add ability to require invite request text (#15326) 
Fixes #15273

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-14 10:03:09 +01:00
ThibG a7e819b8a8
Fix dynamic updating of “Bootstrap timeline accounts” admin setting (#15325) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-14 09:37:58 +01:00
Eugen Rochko 4fd3062003
Change "Profile unavailable" string to "Account suspended" in web UI (#15345) 2020-12-14 09:08:09 +01:00
Eugen Rochko 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
 2020-12-14 09:06:34 +01:00
Eugen Rochko a3b5675aa8
Change number format on about page from full to shortened (#15327) 2020-12-14 05:09:14 +01:00
Claire 4acb5c90a2 Use “public.js” pack for auth pages for form validation helpers 2020-12-10 13:01:51 +01:00
ThibG cbe9b0640b
Merge pull request #1473 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-10 10:25:52 +01:00
ThibG 9a5825f864 [Glitch] Add honeypot fields and minimum fill-out time for sign-up form 
Port 49eb4d4ddf to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-10 09:44:16 +01:00
ThibG 237025b5ef [Glitch] Fix notifications being unnecessarily redrawn on state change 
Port 9669167aae to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-10 09:42:32 +01:00
Claire 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.
 2020-12-10 09:41:49 +01:00
ThibG 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>
 2020-12-10 06:27:26 +01:00
ThibG 9669167aae
Fix notifications being unnecessarily redrawn on state change (#15312) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 19:16:30 +01:00
ThibG b27d11dd33
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-09 19:06:13 +01:00
ThibG 7d0e45a3be [Glitch] Fix column swiping animation logic 
Port 0b437325dc to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 15:12:28 +01:00
Eugen Rochko e18f9f8228 [Glitch] Fix unnecessary re-rendering of various components when typing in web UI 
Partially port 9620ee90be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 15:11:38 +01:00
trwnh 3449ffa133 [Glitch] rename replies_policy enumerables 
Port front-end changes from 127c543a6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 14:58:09 +01:00
Eugen Rochko b5134595d8 [Glitch] Fix alert when failing to save timeline markers in web UI 
Port 59d943e152 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 14:57:17 +01:00
Claire a16175645d Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
trwnh 127c543a6e
rename replies_policy enumerables (#15304) 2020-12-09 04:34:17 +01:00
Takeshi Umeda f379a52d74
Fix missing pictureInPicture prop in detailed status container (#15309) 2020-12-09 04:33:33 +01:00
Jeong Arm 7aee364795
Fix open media hotkey (#15308) 
* Fix open media hotkey

* Update status.js

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2020-12-09 00:24:13 +01:00
Takeshi Umeda 765626a3a7
Fix the Open handler for PreviewCard (#15305) 2020-12-08 12:07:54 +01:00
ThibG 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>
 2020-12-07 20:07:24 +01:00
Eugen Rochko 9620ee90be
Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
Eugen Rochko 48bef17cc9
Fix slow distinct queries where grouped queries are faster (#15287) 
About 2x speed-up on inboxes query
 2020-12-07 12:08:30 +01:00
Eugen Rochko 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
 2020-12-07 04:29:37 +01:00
Eugen Rochko 59d943e152
Fix alert when failing to save timeline markers in web UI (#15285) 
Fix #15267
 2020-12-07 03:23:43 +01:00
Eugen Rochko 014733d1e4
Fix too low contrast on new media modal background in web UI (#15284) 
Fix #15258
 2020-12-07 02:32:27 +01:00
Takeshi Umeda 17a2e27641
Fix remove number sign from account_featured_tags (#15277) 2020-12-06 05:55:35 +01:00
ThibG 25f725d67a
Merge pull request #1470 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-05 22:03:28 +01:00
Mélanie Chauvel 40e2de3904 [Glitch] Fix character count not ignoring hidden CW field 
Port 68775b6039 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-05 21:15:18 +01:00
Claire 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.
 2020-12-05 17:33:37 +01:00
Starfall 13df125b6c Add favourite modal to light theme CSS 2020-12-05 13:23:39 +01:00
Takeshi Umeda 44d5c6bc8f
Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270) 2020-12-04 04:22:35 +01:00
ThibG 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.
 2020-12-04 02:23:51 +01:00
ThibG d849aad852
Change public thread view to hide "Show thread" link (#15266) 
Fixes #15262
 2020-12-02 21:21:44 +01:00
ThibG 9136be480f
Fix followers hash cache not being invalidated on account merge (#15256) 
Also clear relationships cache.
 2020-12-02 21:20:00 +01:00
ThibG fbff89be03
Fix tootctl ip_blocks add failing if not given a comment (#15263) 
Fixes #15261
 2020-12-02 21:19:41 +01:00
ThibG 4b7f21a28e
Fix Gemfile.lock breaking CI (#15257) 
Unnecessary Ruby and Bundler version constraints got included in #15230
 2020-12-01 12:34:33 +01:00
Eugen Rochko 17f01ecc4e
Fix changelog containing items from 3.2.1 twice (#15255) 2020-12-01 06:45:58 +01:00
Eugen Rochko 8e0b98556f
Bump version to 3.3.0rc1 (#15230) 2020-12-01 06:38:05 +01:00
Eugen Rochko a55e6e99c0
Fix ku locale not being right-to-left (#15252) 2020-11-30 23:02:32 +01:00
Mélanie Chauvel 68775b6039
Fix character count not ignoring hidden CW field (#15236) 2020-11-30 12:09:34 +01:00
Shlee b429d33e46
Update Dockerfile (#15232) 2020-11-29 09:20:02 +01:00
Eugen Rochko 13b07b88f1
Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228) 2020-11-28 05:17:53 +01:00
Eugen Rochko 13206fcfb8
Fix media modal crashing when media has no blurhash (#15229) 2020-11-28 03:37:01 +01:00
Eugen Rochko e7f1439b97
Bump version to 3.2.1 (#15227) 2020-11-27 18:29:22 +01:00
Eugen Rochko e7e099d1a0
Fix deletes not reaching every server that interacted with status (#15200) 
Extract logic for determining ActivityPub inboxes to send deletes
to to its own class and explicitly include the person the status
replied to (even if not mentioned), people who favourited it, and
people who replied to it (though that one is still not recursive)
 2020-11-27 15:48:31 +01:00
Eugen Rochko e1a6526c8d
Fix media modal regression on public pages (#15221) 2020-11-27 15:41:58 +01:00
Eugen Rochko ec0edf74d6
Fix post-migration warning about index corruption being too scary (#15223) 2020-11-27 15:41:43 +01:00