685270f3f7
[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
...
Port e90649b064
1 year ago
66e82cb8e1
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port b2ac93dd73
1 year ago
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
1 year ago
406f3942a9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port 9a8190da4a
1 year ago
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
1 year ago
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
1 year ago
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.
1 year ago
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
1 year ago
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
1 year ago
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.
1 year ago
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
1 year ago
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.
1 year ago
e90649b064
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )
...
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
1 year ago
b2ac93dd73
Fix selecting domains to forward reports to not passing the information correctly ( #26636 )
1 year ago
9a8190da4a
Change opacity of the delete icon in the search field to be more visible ( #26449 )
1 year ago
613cfd625c
Change hashtag bar tags to be de-emphasized ( #26606 )
1 year ago
152b10b624
Fix some React warnings ( #26609 )
1 year ago
44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )
1 year ago
58acaa9ae6
Better hashtag normalization when processing a post ( #26614 )
1 year ago
c053bfc45a
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port 0446394465
1 year ago
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
1 year ago
245fe855be
[Glitch] Fix unfollow icon styling in advanced column
...
Port d9c21293aa
1 year ago
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.
1 year ago
128daefc7a
Remove leftover `.orig` files that were mistakenly included ( #2379 )
1 year ago
fe31571965
Fix layout of the closed registrations modal ( #26593 )
1 year ago
724d773844
[Glitch] Fix "Create Account" button in interaction modal
...
Port a664e15702
1 year ago
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
1 year ago
061fd66ee6
Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )
1 year ago
bb23116e8d
Fix profile picture preview ( #26538 )
1 year ago
bb51c0676d
Remove redundant ready() wrapper ( #26533 )
1 year ago
3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
1 year ago
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
1 year ago
f0862bcf98
Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )
1 year ago
85ecadb630
Fix hashtag bar display when status is in a thread ( #26497 )
1 year ago
df6e719898
Add display of out-of-band hashtags in the web interface ( #26492 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
d9c21293aa
Fix unfollow icon styling in advanced column ( #26482 )
1 year ago
c452ccd913
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
a664e15702
Fix "Create Account" button in interaction modal ( #26459 )
1 year ago
987f190839
[Glitch] Fix reply not preserving the language from the replied-to post
...
Port 34f3001278
1 year ago
92df185be7
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
1 year ago
e28727aab3
[Glitch] Change the hashtag column to not display the hashtag header on pinned columns
...
Port 4caa9f0e69
1 year ago
7c4b115e7d
[Glitch] Fix interaction modal layout
...
Port cd6f2b3cbc
1 year ago
0f8ddf367c
[Glitch] Change header of hashtag timelines in web UI
...
Port e325443b02
1 year ago
d9451feef0
[Glitch] Fix report modal secondary buttons style
...
Port 79936c584f
1 year ago
2f50b77ae8
[Glitch] Fix confirmation when closing media edition modal with unsaved changes
...
Port b59053ff8c
1 year ago
f0ad745506
[Glitch] Fix light theme select option for hashtags
...
Port 93372fee1e
1 year ago
03ae73bdc5
[Glitch] Change design of hidden media overlay (again) in web UI
...
Port 04e7efac3f
1 year ago
8247df3a8d
[Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI
...
Port 9d719bcd85
1 year ago
Claire
Antonin Del Fabbro
Christian Schmidt
Renaud Chaput
mogaminsk
Santiago Kozak
github-actions[bot]
Eugen Rochko
Trevor Wolf