Jeremy Kescher
|
6d448d46ff
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
|
2024-05-29 14:23:08 +02:00 |
|
Renaud Chaput
|
e32bfad88a
|
[Glitch] Fix createDataLoadingThunk and related actions
Port b6fd14f0e2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-23 20:37:00 +02:00 |
|
Renaud Chaput
|
8d6058b40a
|
[Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests
Port 10ec421dd4 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-23 20:33:05 +02:00 |
|
Jeremy Kescher
|
d1856ea48d
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/initial_state.js
|
2024-05-22 23:56:46 +02:00 |
|
Renaud Chaput
|
3e9298370d
|
[Glitch] Remove the access token from Redux & context
Port 2c5ab8f647 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-22 21:14:54 +02:00 |
|
Jeremy Kescher
|
70c76a1f30
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-17 15:33:30 +02:00 |
|
Claire
|
7b078b46a2
|
[Glitch] Fix Web UI trying to save user settings when logged out
Port 66906a1bc1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-16 19:34:50 +02:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
David Beck
|
defd1e4024
|
[Glitch] Remove home marker updates
Port 4f4b77920e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-04 15:42:33 +02:00 |
|
Renaud Chaput
|
552e09d57f
|
[Glitch] Fix marker thunks to not ignore eslint directives for the whole file
Port 65093c619f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-04 15:30:18 +02:00 |
|
Renaud Chaput
|
b3d5567bd0
|
[Glitch] Remove global boosts state and convert boosts modal to Typescript
Port 67442f9039 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-01 16:42:20 +02:00 |
|
Renaud Chaput
|
555f45f249
|
[Glitch] Fix notifications marker fetch
Port b9982ce578 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-01 15:56:37 +02:00 |
|
Renaud Chaput
|
371c5e59eb
|
[Glitch] Rewrite PIP state in Typescript
Port 9fbe8d3a0c to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-01 15:56:37 +02:00 |
|
Renaud Chaput
|
059e10e546
|
[Glitch] Rewrite markers reducer in Typescript
Port 27d014a7fa to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-01 14:55:03 +02:00 |
|
Jeremy Kescher
|
2df3b9f803
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/serializers/initial_state_serializer.rb
|
2024-04-11 21:50:48 +02:00 |
|
Eugen Rochko
|
91531e9586
|
[Glitch] Add ability to reorder uploaded media before posting in web UI
Port 8e7e86ee35 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-04-06 22:34:03 +02:00 |
|
Jeremy Kescher
|
a53f2cf970
|
Merge branch 'glitch-soc' into develop
|
2024-03-19 18:31:27 +01:00 |
|
Eugen Rochko
|
80fda17868
|
[Glitch] Change mute, block and domain block confirmations in web UI
Port ec19d0a14b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-15 22:58:01 +01:00 |
|
Jeremy Kescher
|
21a23b58ab
|
Merge branch 'glitch-soc' into develop
|
2024-03-14 21:46:57 +01:00 |
|
Jeremy Kescher
|
caccc2e0f4
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
|
2024-03-14 20:01:30 +01:00 |
|
Claire
|
84c7b272e1
|
[Glitch] Fix accounts not getting imported into redux store for some filtered notification types
Port 95a5713ff7 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-14 17:43:38 +01:00 |
|
Eugen Rochko
|
13c9524436
|
[Glitch] Add notification policies and notification requests in web UI
Port c10bbf5fe3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-13 18:38:46 +01:00 |
|
Renaud Chaput
|
6440651976
|
[Glitch] Use the server setting to get the max number of poll options in UI
Port b9722dfe2b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-11 17:38:07 +01:00 |
|
Claire
|
98cf4b7ba0
|
Reduce code differences with upstream
|
2024-03-08 12:42:03 +01:00 |
|
Claire
|
e95f2c2b68
|
Add a glitch-soc local setting to make the post publish toast optional (#2666)
|
2024-03-08 11:35:18 +01:00 |
|
Jeremy Kescher
|
05747febb6
|
Merge branch 'glitch-soc' into develop
|
2024-02-29 19:32:12 +01:00 |
|
Essem
|
9242c536d2
|
Use openURL function from upstream
|
2024-02-28 23:41:18 -06:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
Jeremy Kescher
|
8f8cb0fad3
|
Merge branch 'glitch-soc' into develop
|
2024-02-24 17:51:18 +01:00 |
|
Eugen Rochko
|
cce3f3d6da
|
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
Port 9cdc60ecc6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:35:08 +01:00 |
|
Claire
|
84d05ca221
|
Reimplement glitchy elephant friend
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
118bb5bc81
|
Add secondary post button back
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
7586d4348f
|
Switch glitch-soc to upstream's old composer
|
2024-02-22 22:10:17 +01:00 |
|
Jeremy Kescher
|
c2c2afc294
|
Merge branch 'glitch-soc' into develop
|
2024-01-28 02:29:46 +01:00 |
|
Eugen Rochko
|
72bae7e170
|
[Glitch] Fix duplicate and missing keys in search popout component in web UI
Port 9f8e3cca9a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-22 19:21:02 +01:00 |
|
Jeremy Kescher
|
777be10810
|
Merge branch 'glitch-soc' into develop
|
2024-01-14 19:46:03 +01:00 |
|
Eugen Rochko
|
bacb9134cc
|
[Glitch] Add profile setup to onboarding in web UI
Port d67bd44ca1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-14 16:32:08 +01:00 |
|
Essem
|
6ae86f40d1
|
Add support for emoji reactions
Squashed, modified, and rebased from glitch-soc/mastodon#2221.
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
|
2023-12-29 12:33:13 -06:00 |
|
Renaud Chaput
|
a4a728b01d
|
[Glitch] Fix the loading bar with the new Redux actions
Port 8b1eeb2f90 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 19:49:44 +01:00 |
|
Claire
|
93c71e2c7c
|
[Glitch] Fix notification sounds
Port f3864db409 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 19:49:44 +01:00 |
|
Renaud Chaput
|
e94fecdcc8
|
[Glitch] Fix the notificationsUpdate call
Port f476d9dab2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 19:49:44 +01:00 |
|
Renaud Chaput
|
7fe5623a27
|
[Glitch] Use Immutable Record for accounts in Redux state
Port 3bf2a7296e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 19:49:44 +01:00 |
|
Claire
|
f5de9fe99a
|
[Glitch] Allow viewing and severing relationships with suspended accounts
Port c451bbe249 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-18 18:49:48 +01:00 |
|
Claire
|
3d3fa75c81
|
Reduce composer differences with upstream and simplify code (#2518)
|
2023-12-18 13:20:08 +01:00 |
|
Claire
|
23ee393fdd
|
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
Port upstream's toast changes
|
2023-12-03 20:57:42 +01:00 |
|
Eugen Rochko
|
cede2f533c
|
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
Port 71641766f2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 19:39:08 +01:00 |
|
Renaud Chaput
|
9ac73a1fbf
|
[Glitch] Change eslint config to autofix missing comma and indentation in JS files
Partial port of 774e1189d2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 16:44:40 +01:00 |
|
Eugen Rochko
|
3bbe39f233
|
[Glitch] Add toast with option to open post after publishing in web UI
Port a7ca33ad96 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 16:38:41 +01:00 |
|
Renaud Chaput
|
6fb5fafd28
|
[Glitch] Convert actions/account_notes into Typescript
Port bd06c13204 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 13:19:10 +01:00 |
|
Eugen Rochko
|
542f2fb1e0
|
[Glitch] Add default post text to onboarding flow in web UI
Port 8979b70975 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 11:23:12 +01:00 |
|