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

3255 commits

Author SHA1 Message Date
Claire
592a675a33 Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' 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.
 2023-08-24 21:56:00 +02:00
Claire
2a8e55b0ee Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' 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
d0a26a2a16 Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
Claire
b63ddc70d6 Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633) 
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
 2023-08-24 14:10:48 +02:00
Claire
6db702fa24 Fix selecting domains to forward reports to not passing the information correctly (#26636) 2023-08-24 14:06:27 +02:00
Claire
77280a5b1d Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt
6a4160cb5f Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput
3fa794b94b 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
585e53784e Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Claire
c52397dea3 Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire
b6ca020d02 Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' 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
ccf5f88e43 Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Renaud Chaput
d13a03e830 Remove hashtags from the last line of a status if it only contains hashtags (#26499) 2023-08-21 19:39:01 +02:00
Claire
5904d363b9 Fix case-insensitive comparison of hashtags to do case-folding (#26525) 2023-08-17 12:49:52 +02:00
Claire
a19ce425ef Fix “legal” report category not showing up in moderation interface (#26509) 2023-08-16 16:38:33 +02:00
Claire
805e0eff77 Fix hashtag bar sometimes including tags that appear in the post's body (#26506) 2023-08-16 11:47:59 +02:00
Claire
321e7aa07f 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
bd7f631918 Fix unfollow icon styling in advanced column (#26482) 2023-08-14 19:02:47 +02:00
github-actions[bot]
30f84f10b1 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
10651d8b8a Fix "Create Account" button in interaction modal (#26459) 2023-08-14 12:04:04 +02:00
Claire
436d049fa8 Merge commit '60438e609795bbd99bf38adb739d46155de8daa3' into glitch-soc/merge-upstream 2023-08-13 19:23:22 +02:00
Claire
33024cca51 Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' 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
Claire
a9219018a7 Fix reply not preserving the language from the replied-to post (#26452) 2023-08-12 00:06:37 +02:00
Claire
32faa7213f Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
github-actions[bot]
ef78647bb0 New Crowdin Translations (automated) (#26373) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-10 09:47:42 +02:00
Claire
f08d97c0c2 Change the hashtag column to not display the hashtag header on pinned columns (#26416) 2023-08-09 16:32:40 +02:00
Claire
cae84de47b Fix interaction modal layout (#26368) 2023-08-07 17:58:29 +02:00
github-actions[bot]
93b225dfde New Crowdin Translations (automated) (#26209) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-07 13:37:54 +02:00
Eugen Rochko
2ddf268e73 Change header of hashtag timelines in web UI (#26362) 2023-08-07 09:46:11 +02:00
Claire
aac7e9fd9d Fix confirmation when closing media edition modal with unsaved changes (#26342) 2023-08-04 15:48:29 +02:00
Eugen Rochko
1a2f3b8a9b Change reblogs to be excluded from "Posts and replies" tab in web UI (#26302) 2023-08-03 20:39:33 +02:00
CSDUMMI
1ebdd46242 Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083) 2023-08-03 16:43:15 +02:00
Christian Schmidt
ecb00fa5ac Add alt text for preview card thumbnails (#26184) 2023-08-03 15:41:51 +02:00
Eugen Rochko
9a214a414e Change design of role badges in web UI (#26281) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-02 17:24:32 +02:00
Claire
1fd3d95e65 Change interaction modal input to disable browser spell-checking, capitalization and autocomplete (#26267) 2023-08-01 17:11:30 +02:00
Claire
84bc751433 Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 2023-07-30 16:11:55 +02:00
Claire
68d080177a Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
Claire
f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
 2023-07-30 14:58:56 +02:00
Claire
1039fce896 Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
cb4ffdea8b Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
 2023-07-30 13:49:35 +02:00
Claire
2f3f1d75fa Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
 2023-07-30 13:15:01 +02:00
Eugen Rochko
b49ab86b01 Change aspect ratios on link previews in web UI (#26250) 2023-07-30 03:35:17 +02:00
Plastikmensch
0ec4833397 Fix public TL not indicating new toots when onlyRemote is enabled (#26247) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-29 20:18:38 +02:00
Claire
fc10002966 Change the wording of the dismissable explore prompt (#25917) 2023-07-27 16:51:02 +02:00
Claire
7c911ce842 Fix emoji picker button scrolling with textarea content in single-column view (#25304) 2023-07-27 16:20:33 +02:00
Claire
20809d5d8c Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
Claire
03ccbb053b Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
github-actions[bot]
4a9961e904 New Crowdin Translations (automated) (#26072) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-26 13:46:16 +02:00
Christian Schmidt
aa8d37c422 Fix missing GIF badge in account gallery (#26166) 2023-07-26 03:33:31 +02:00
Christian Schmidt
28eb5e8f4c Preserve translation on status re-import (#26168) 2023-07-25 20:29:31 +02:00