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

39663 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
9d12bbf0e2 Fix too low contrast on new media modal background in web UI (#15284) 
Fix #15258
 2020-12-07 02:32:27 +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
c229a3aab7 Fix remove number sign from account_featured_tags (#15277) 2020-12-06 05:55:35 +01:00
Takeshi Umeda
17a2e27641
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
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
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
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
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
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
5b87387e19 Add favourite modal to light theme CSS 2020-12-05 13:23:39 +01:00
Starfall
13df125b6c 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
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
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
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
b62b44a0e1 Change public thread view to hide "Show thread" link (#15266) 
Fixes #15262
 2020-12-02 21:21:44 +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
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
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
27a1419a65 Fix tootctl ip_blocks add failing if not given a comment (#15263) 
Fixes #15261
 2020-12-02 21:19:41 +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
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
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
3f7dc86890 Fix changelog containing items from 3.2.1 twice (#15255) 2020-12-01 06:45:58 +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
2207431f39 Bump version to 3.3.0rc1 (#15230) 2020-12-01 06:38:05 +01:00
Eugen Rochko
8e0b98556f
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
Eugen Rochko
a55e6e99c0
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
Mélanie Chauvel
68775b6039
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
Shlee
b429d33e46
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
13b07b88f1
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
Eugen Rochko
13206fcfb8
Fix media modal crashing when media has no blurhash (#15229) 2020-11-28 03:37:01 +01:00
Eugen Rochko
77aba785e9 Bump version to 3.2.1 (#15227) 2020-11-27 18:29:22 +01:00
Eugen Rochko
e7f1439b97
Bump version to 3.2.1 (#15227) 2020-11-27 18:29:22 +01:00
Eugen Rochko
715c8eac80 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
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
841c0c9a28 Fix media modal regression on public pages (#15221) 2020-11-27 15:41:58 +01:00
Eugen Rochko
e1a6526c8d
Fix media modal regression on public pages (#15221) 2020-11-27 15:41:58 +01:00
Eugen Rochko
6a7221587b Fix post-migration warning about index corruption being too scary (#15223) 2020-11-27 15:41:43 +01:00
Eugen Rochko
ec0edf74d6
Fix post-migration warning about index corruption being too scary (#15223) 2020-11-27 15:41:43 +01:00
Eugen Rochko
af1fa584e9 Change media modals look in web UI (#15217) 
- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar
 2020-11-27 03:24:11 +01:00
Eugen Rochko
1e89e2ed98
Change media modals look in web UI (#15217) 
- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar
 2020-11-27 03:24:11 +01:00