tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,929 Commits 10 Branches 0 Tags
80f89f9cf25436d07ed7dcf908392daf686f7dff
Commit Graph

6542 Commits

Author SHA1 Message Date
Antonin Del Fabbro
406f3942a9 [Glitch] Change opacity of the delete icon in the search field to be more visible 
Port 9a8190da4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:51:13 +02:00
Claire
32e67e78a3 Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Christian Schmidt
def58f8ac3 [Glitch] Fix some React warnings 
Port 152b10b624 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire
b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire
bdce78187c [Glitch] Fix layout of the closed registrations modal 
Port fe31571965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:38:08 +02:00
Christian Schmidt
9b094f3653 [Glitch] Fix profile picture preview 
Port SCSS changes from bb23116e8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:36:42 +02:00
Claire
296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
 2023-08-24 21:26:27 +02:00
Claire
88ff45a3b2 Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
Claire
fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
 2023-08-24 21:01:19 +02:00
Christian Schmidt
e67c28a5fe [Glitch] Remove redundant ready() wrapper 
Port bb51c0676d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 20:35:22 +02:00
Claire
7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
 2023-08-24 20:34:14 +02:00
Antonin Del Fabbro
9a8190da4a Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Claire
613cfd625c Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt
152b10b624 Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput
44ba785242 Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
Renaud Chaput
58acaa9ae6 Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Claire
c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface 
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:54:22 +02:00
Claire
10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire
245fe855be [Glitch] Fix unfollow icon styling in advanced column 
Port d9c21293aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:48:23 +02:00
Claire
2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Claire
128daefc7a Remove leftover .orig files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
Claire
fe31571965 Fix layout of the closed registrations modal (#26593) 2023-08-22 09:11:59 +02:00
mogaminsk
724d773844 [Glitch] Fix "Create Account" button in interaction modal 
Port a664e15702 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 21:08:56 +02:00
Claire
7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Renaud Chaput
061fd66ee6 Remove hashtags from the last line of a status if it only contains hashtags (#26499) 2023-08-21 19:39:01 +02:00
Christian Schmidt
bb23116e8d Fix profile picture preview (#26538) 2023-08-18 18:24:32 +02:00
Christian Schmidt
bb51c0676d Remove redundant ready() wrapper (#26533) 2023-08-18 12:06:08 +02:00
Claire
3ed2bf92d0 Fix case-insensitive comparison of hashtags to do case-folding (#26525) 2023-08-17 12:49:52 +02:00
Claire
0446394465 Fix “legal” report category not showing up in moderation interface (#26509) 2023-08-16 16:38:33 +02:00
Claire
f0862bcf98 Fix hashtag bar sometimes including tags that appear in the post's body (#26506) 2023-08-16 11:47:59 +02:00
Santiago Kozak
85ecadb630 Fix hashtag bar display when status is in a thread (#26497) 2023-08-16 09:06:04 +02:00
Claire
df6e719898 Add display of out-of-band hashtags in the web interface (#26492) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 23:42:30 +02:00
Claire
d9c21293aa Fix unfollow icon styling in advanced column (#26482) 2023-08-14 19:02:47 +02:00
github-actions[bot]
c452ccd913 New Crowdin Translations (automated) (#26444) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-14 14:54:31 +02:00
mogaminsk
a664e15702 Fix "Create Account" button in interaction modal (#26459) 2023-08-14 12:04:04 +02:00
Claire
987f190839 [Glitch] Fix reply not preserving the language from the replied-to post 
Port 34f3001278 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:24:50 +02:00
Claire
92df185be7 Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream 2023-08-13 19:23:22 +02:00
Claire
e28727aab3 [Glitch] Change the hashtag column to not display the hashtag header on pinned columns 
Port 4caa9f0e69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:13:11 +02:00
Claire
7c4b115e7d [Glitch] Fix interaction modal layout 
Port cd6f2b3cbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:12:42 +02:00
Eugen Rochko
0f8ddf367c [Glitch] Change header of hashtag timelines in web UI 
Port e325443b02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:11:52 +02:00
Claire
d9451feef0 [Glitch] Fix report modal secondary buttons style 
Port 79936c584f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:08:08 +02:00
Claire
2f50b77ae8 [Glitch] Fix confirmation when closing media edition modal with unsaved changes 
Port b59053ff8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:06:02 +02:00
Trevor Wolf
f0ad745506 [Glitch] Fix light theme select option for hashtags 
Port 93372fee1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:05:24 +02:00
Eugen Rochko
03ae73bdc5 [Glitch] Change design of hidden media overlay (again) in web UI 
Port 04e7efac3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:04:07 +02:00
Eugen Rochko
8247df3a8d [Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI 
Port 9d719bcd85 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:02:17 +02:00
CSDUMMI
64fc66d3db [Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083) 
Port 120f5802c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:00:25 +02:00
Christian Schmidt
1461cc53ed [Glitch] Add alt text for preview card thumbnails 
Port 8da99ffb0d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 18:56:58 +02:00
Claire
6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Eugen Rochko
57a4e7927a [Glitch] Add client-side timeout on resend confirmation button 
Port 2f932cb2bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-12 09:38:57 +02:00
Claire
ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00