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

1503 commits

Author SHA1 Message Date
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
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
Eugen Rochko
2ddf268e73 Change header of hashtag timelines in web UI (#26362) 2023-08-07 09:46:11 +02:00
Claire
1037c413cf Fix report modal secondary buttons style (#26341) 2023-08-04 16:25:44 +02:00
Trevor Wolf
395dc4524f Fix light theme select option for hashtags (#26311) 2023-08-04 09:41:17 +02:00
Eugen Rochko
6ff571563c Change design of hidden media overlay (again) in web UI (#26330) 2023-08-03 20:39:45 +02:00
Trevor Wolf
8b1bd9a80f change column link to add a better keyboard focus indicator (#26278) 2023-08-02 19:33:41 +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
Eugen Rochko
cfe0468d98 Fix line clamp for link previews in web UI (#26286) 2023-08-02 04:17:23 +02:00
Eugen Rochko
ccbcc25ac4 Fix wrong border radius on link cards in web UI (#26287) 2023-08-02 01:57:31 +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
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
Eugen Rochko
b49ab86b01 Change aspect ratios on link previews in web UI (#26250) 2023-07-30 03:35:17 +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
Claire
1d29569d89 Revert poll colors to green outside of compose form (#26164) 2023-07-25 15:32:59 +02:00
Trevor Wolf
e6475f79d7 fix poll input active style (#26162) 2023-07-25 13:39:15 +02:00
Eugen Rochko
b977a84e19 Add published date and author to news on the explore screen in web UI (#26155) 2023-07-25 00:57:15 +02:00
Eugen Rochko
a90d7ac141 Fix missing action label on sensitive videos and embeds in web UI (#26135) 2023-07-24 22:04:38 +02:00
Eugen Rochko
5db70fc514 Fix missing border on error screen in light theme in web UI (#26152) 2023-07-24 19:53:33 +02:00
gol-cha
633071d1d5 Fix UI Overlap with the loupe icon in the Explore Tab (#26113) 2023-07-24 17:56:20 +02:00
Trevor Wolf
d5a4ef8459 change poll form element colors to fit with the rest of the ui (#26139) 2023-07-24 13:48:09 +02:00
Eugen Rochko
9015e5b194 Change design of link previews in web UI (#26136) 2023-07-24 13:47:28 +02:00
Eugen Rochko
1c28a202fe Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Eugen Rochko
5a5d8a9757 Fix focus and hover styles in web UI (#26125) 2023-07-23 17:55:13 +02:00
Trevor Wolf
e1c5bed7b4 change focus ui for keyboard only input (#25935) 2023-07-21 13:20:14 +02:00
Claire
0ef1efbe71 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
Michael Stanclift
40e20d687a Fix for "follows you" indicator in light web UI not readable (#25993) 2023-07-17 11:51:00 +02:00
Terence Eden
82b0cfce7e Prevent split line between icon and number on reposts & favourites (#26004) 2023-07-16 10:06:33 +02:00
Claire
3c714ea3d2 Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
Claire
268e955aef Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
 2023-07-13 13:49:58 +02:00
Claire
fc6d89573c Fix follow link style in embeds (#25965) 2023-07-13 12:58:56 +02:00
Renaud Chaput
9094a65fd4 Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
Claire
1399e9d863 Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
 2023-07-12 16:03:05 +02:00
Claire
9af6f6db1a Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Claire
2189682f8f Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Claire
54b6b035a7 Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Claire
63ca7222d6 Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
Claire
8a27e68050 Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Renaud Chaput
8d20afe0aa Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
Stanislas Signoud
d36859f37e Use invariant colors on notification toasts (#25919) 2023-07-11 23:30:21 +02:00
Trevor Wolf
29c29410d2 fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00
Claire
66693177ff Add forward_to_domains parameter to POST /api/v1/reports (#25866) 2023-07-10 18:26:56 +02:00
Eugen Rochko
7496c1b655 Change label and design of sensitive and unavailable media in web UI (#25712) 2023-07-08 20:05:33 +02:00
Eugen Rochko
703ff75549 Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
Renaud Chaput
7ff696d848 Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
Claire
784f2f35bc Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00