0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
40e20d687a
Fix for "follows you" indicator in light web UI not readable ( #25993 )
1 year ago
84c0f759d3
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
1 year ago
82b0cfce7e
Prevent split line between icon and number on reposts & favourites ( #26004 )
1 year ago
37e01f530b
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 528a8d0cbe
1 year ago
160af03565
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 663e9484e2
1 year ago
6a458a9baf
Remove layout glitch-soc settings
1 year ago
37e80ae4c8
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port 3df957104a
1 year ago
8d5e9e02e9
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 618eb10d18
1 year ago
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
1 year ago
7714478818
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in f1de5093fb
1 year ago
b27efe7c22
Fix home timeline's regexp field
1 year ago
528a8d0cbe
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
1 year ago
663e9484e2
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
1 year ago
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
1 year ago
c1bd8248c4
[Glitch] Fix follow link style in embeds
...
Port fc6d89573c
1 year ago
e5f09f145a
[Glitch] Upgrade to `typescript-eslint` v6
...
Port a09ed92a77
1 year ago
90a0f97140
Fix incorrect types in DisplayName
1 year ago
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
1 year ago
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
1 year ago
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
1 year ago
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
1 year ago
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.
1 year ago
fc6d89573c
Fix follow link style in embeds ( #25965 )
1 year ago
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
1 year ago
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
1 year ago
bd06bdf164
Fix various CSS issues
1 year ago
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.
1 year ago
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
1 year ago
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
1 year ago
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
1 year ago
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
1 year ago
e91c424b7c
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port 66693177ff
1 year ago
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
1 year ago
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
1 year ago
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.
1 year ago
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
1 year ago
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.
1 year ago
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
1 year ago
4781c1f7eb
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port b5c5e2bf36
1 year ago
5a6f556541
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 9203ab410c
1 year ago
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
1 year ago
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
1 year ago
a64181f28b
Fix import order inconsistencies ( #2289 )
1 year ago
8d20afe0aa
Update Stylelint ( #25819 )
1 year ago
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
d36859f37e
Use invariant colors on notification toasts ( #25919 )
1 year ago
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
1 year ago
047d44611b
Fix filters not applying to explore tab ( #25887 )
1 year ago
Claire
Michael Stanclift
Terence Eden
Stanislas Signoud
Eugen Rochko
Plastikmensch
Renaud Chaput
Trevor Wolf
fusagiko / takayamaki
alfe