Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
Claire
|
6662d604c1
|
[Glitch] Add loading indicator and empty result message to advanced interface search
Port 7d3fe2b4c3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-04 16:15:54 +02:00 |
|
Claire
|
aac59a34ed
|
[Glitch] Add in-app notifications for moderation actions/warnings
Port 4ef0b48b95 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-04 15:29:29 +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
|
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 |
|
Claire
|
0f966209ca
|
[Glitch] Add notifications of severed relationships
Port 44bf7b8128 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-04-06 19:38:57 +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
|
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 |
|
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
|
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
|
4c24022984
|
Fix min_options, let vanilla flavor behave properly for pollLimits
|
2024-02-24 18:25:47 +01:00 |
|
Jeremy Kescher
|
8f8cb0fad3
|
Merge branch 'glitch-soc' into develop
|
2024-02-24 17:51:18 +01:00 |
|
Hinaloe
|
ba67ea3d12
|
[Glitch] Fix sensitive flag not being removed when removing CW in new compose form
Port c645490d55 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:53:49 +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
|
5fd50756b4
|
Restore glitch-soc's support of custom poll limits
|
2024-02-22 23:06:12 +01:00 |
|
Eugen Rochko
|
9c10aaa4d5
|
[Glitch] Change design of compose form in web UI
Port 6936e5aa69 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-22 23:06:12 +01:00 |
|
Claire
|
7586d4348f
|
Switch glitch-soc to upstream's old composer
|
2024-02-22 22:10:17 +01:00 |
|
Jeremy Kescher
|
1c9291adcd
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
|
2024-02-14 18:02:38 +01:00 |
|
Claire
|
f6f62002c7
|
Remove leftovers from glitch-soc's layout option
|
2024-02-08 19:21:35 +01:00 |
|
Jeremy Kescher
|
93ae46fa14
|
Merge branch 'glitch-soc' into develop
|
2024-01-18 22:59:27 +01:00 |
|
renovate[bot]
|
d56e9fb873
|
[Glitch] Update devDependencies (non-major)
Port 4e277f83dc to glitch-soc
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-17 18:12:00 +01:00 |
|
Jeremy Kescher
|
c677b8de19
|
v4.3.0-alpha.0+glitch+cat+1.0.5
|
2024-01-12 22:03:50 +01:00 |
|
Renaud Chaput
|
09376a8207
|
[Glitch] Upgrade Redux packages
Port a0e237a96f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-10 18:34:23 +01:00 |
|
Jeremy Kescher
|
3b9a52aab6
|
Merge branch 'glitch-soc' into develop
|
2024-01-04 17:57:02 +01:00 |
|
Claire
|
48c9192b47
|
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
Port 65ea097f1d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-02 18:16:57 +01:00 |
|
Jeremy Kescher
|
5be3fb3d66
|
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
|
2024-01-02 12:16:35 +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 |
|
Claire
|
b41af99673
|
[Glitch] Change dismissed banners to be stored server-side
Port 7faa27e17d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 20:40:47 +01:00 |
|
Claire
|
70652e49eb
|
[Glitch] Fix error when muting users from Web UI
Port 32319187ee to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-20 19:49:44 +01:00 |
|
Renaud Chaput
|
79678cf841
|
[Glitch] Fixes website not loading for unlogged users
Port 6712bf86cd 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
|
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
|
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 |
|
Claire
|
046cb408b7
|
[Glitch] Fix front-end bug when processing relationship-related account actions
Port 287520453c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 13:19:10 +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 |
|
Eugen Rochko
|
4537b4b961
|
[Glitch] Add new onboarding flow to web UI
Port 0461f83320 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-03 11:23:12 +01:00 |
|
Claire
|
335cfab32f
|
Change account note design to match upstream's (#2495)
|
2023-12-03 11:22:38 +01:00 |
|
Claire
|
349579e318
|
Fix more code discrepancies
|
2023-11-15 17:16:21 +01:00 |
|
Claire
|
3b210e093a
|
Fix more code style discrepancies
|
2023-11-15 12:53:21 +01:00 |
|
Claire
|
542d95c2bc
|
Fix import style discrepancy
|
2023-11-15 12:53:21 +01:00 |
|
Claire
|
a97b722ad5
|
Reduce differences with upstream due to import style (#2465)
Fix relative / VS absolute style imports, and fix whitespace discrepancies
|
2023-11-15 12:01:51 +01:00 |
|