me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13266 commits 2 branches 0 tags 429 MiB
Commit graph

13266 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot[bot]
64e0b94749 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>
 2020-12-15 03:17:06 +01:00
Takeshi Umeda
a0c4783673 Fix to isolate the sidekiq process that runs the scheduler job (#15314) 2020-12-15 03:04:03 +01:00
Marcin Mikołajczak
429d837f80 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>
 2020-12-15 02:04:56 +01:00
Claire
ab80c3215a Fix processing of Delete activities on direct messages 2020-12-14 23:05:32 +01:00
ThibG
64eaaff345 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
5749bd73ca 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
2d8ee84ed6 Change "Profile unavailable" string to "Account suspended" in web UI (#15345) 2020-12-14 09:08:09 +01:00
Eugen Rochko
df8874b24e 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
c2ff16b1ed Change number format on about page from full to shortened (#15327) 2020-12-14 05:09:14 +01:00
Claire
dfe64b8767 Use “public.js” pack for auth pages for form validation helpers 2020-12-10 13:01:51 +01:00
ThibG
b6eac267cc Merge pull request #1473 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-10 10:25:52 +01:00
ThibG
ec9bc28490 [Glitch] Add honeypot fields and minimum fill-out time for sign-up form 
Port e1ef5f3b31 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
eab7d380e9 [Glitch] Fix notifications being unnecessarily redrawn on state change 
Port 772f525c90 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
2736b1f95e 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
e1ef5f3b31 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
772f525c90 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
e0e94479df Merge pull request #1472 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-09 19:06:13 +01:00
ThibG
479031e8e1 [Glitch] Fix column swiping animation logic 
Port 58a3eaccba 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
347a8864dd [Glitch] Fix unnecessary re-rendering of various components when typing in web UI 
Partially port 7e7f69dfed to glitch-soc

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-09 14:57:17 +01:00
Claire
303aa05c63 Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
trwnh
eb9be7be0c rename replies_policy enumerables (#15304) 2020-12-09 04:34:17 +01:00
Takeshi Umeda
4de05a3606 Fix missing pictureInPicture prop in detailed status container (#15309) 2020-12-09 04:33:33 +01:00
Jeong Arm
46ad37d3a5 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
14b5505c68 Fix the Open handler for PreviewCard (#15305) 2020-12-08 12:07:54 +01:00
ThibG
58a3eaccba 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
7e7f69dfed Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
Eugen Rochko
48534762cf 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
de8c539b7b 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
905032d903 Fix alert when failing to save timeline markers in web UI (#15285) 
Fix #15267
 2020-12-07 03:23:43 +01:00
Eugen Rochko
9d12bbf0e2 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
c229a3aab7 Fix remove number sign from account_featured_tags (#15277) 2020-12-06 05:55:35 +01:00
ThibG
0390eca435 Merge pull request #1470 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-12-05 22:03:28 +01:00
Mélanie Chauvel
41428823de [Glitch] Fix character count not ignoring hidden CW field 
Port 413526a7b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-05 21:15:18 +01:00
Claire
ec5783c59c 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
5b87387e19 Add favourite modal to light theme CSS 2020-12-05 13:23:39 +01:00
Takeshi Umeda
fabb864526 Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270) 2020-12-04 04:22:35 +01:00
ThibG
1fce69291f 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
b62b44a0e1 Change public thread view to hide "Show thread" link (#15266) 
Fixes #15262
 2020-12-02 21:21:44 +01:00
ThibG
39824d29f1 Fix followers hash cache not being invalidated on account merge (#15256) 
Also clear relationships cache.
 2020-12-02 21:20:00 +01:00
ThibG
27a1419a65 Fix tootctl ip_blocks add failing if not given a comment (#15263) 
Fixes #15261
 2020-12-02 21:19:41 +01:00
ThibG
879f86f323 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
3f7dc86890 Fix changelog containing items from 3.2.1 twice (#15255) 2020-12-01 06:45:58 +01:00
Eugen Rochko
2207431f39 Bump version to 3.3.0rc1 (#15230) 2020-12-01 06:38:05 +01:00
Eugen Rochko
9c670a0e7f Fix ku locale not being right-to-left (#15252) 2020-11-30 23:02:32 +01:00
Mélanie Chauvel
413526a7b8 Fix character count not ignoring hidden CW field (#15236) 2020-11-30 12:09:34 +01:00
Shlee
5630db1dab Update Dockerfile (#15232) 2020-11-29 09:20:02 +01:00
Eugen Rochko
a217a14b58 Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228) 2020-11-28 05:17:53 +01:00
Eugen Rochko
c3d62dcf8a Fix media modal crashing when media has no blurhash (#15229) 2020-11-28 03:37:01 +01:00