Essem
c601c78e0d
Fix backups
2023-05-18 13:29:40 -05:00
Essem
640c1d2c42
Merge remote-tracking branch 'catstodon/feature/emoji_reactions'
2023-05-18 13:25:09 -05:00
Essem
1b3c8e3f05
Merge remote-tracking branch 'upstream/main'
2023-05-18 13:24:54 -05:00
Claire
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Claire
054df2d67e
Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-14 15:39:47 +02:00
Jeremy Kescher
0f96d0fbb7
ReactionsController: Don't check for status reaction existence in destroy
...
UnreactService checks for its existence in the background anyway, so remove redundant checks.
2023-05-11 13:40:24 +02:00
Jeremy Kescher
5d0a1a7b74
Fix invalidating status reactions when they already exist
...
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-10 21:07:32 +02:00
Jeremy Kescher
bcc8e89b08
status_reaction_fabricator: Use a unicode emoji instead of "MyString"
...
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-10 21:07:24 +02:00
Jeremy Kescher
a167d715c9
api.rb: Remove resources line that wasn't in routes.rb anymore
...
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-10 21:07:17 +02:00
Essem
2cf4b3a95b
Merge remote-tracking branch 'catstodon/feature/emoji_reactions'
2023-05-09 22:37:07 -05:00
Jeremy Kescher
531ae61398
api.rb: Remove resources line that wasn't in routes.rb anymore
2023-05-10 00:49:41 +02:00
Jeremy Kescher
e2865c0781
Remove German translation for setting_visible_reactions
2023-05-10 00:43:56 +02:00
Jeremy Kescher
873e183d4d
Remove old french emoji reaction-related strings
2023-05-10 00:34:52 +02:00
Jeremy Kescher
2742a9958b
Introduce visible reactions default setting
2023-05-10 00:19:41 +02:00
Jeremy Kescher
bf2c39ec7f
Re-apply schema version
2023-05-10 00:18:32 +02:00
Jeremy Kescher
300c2288ba
Fix visible reactions setting not applying
2023-05-10 00:15:19 +02:00
Jeremy Kescher
c50ccdf69d
eslint fix
2023-05-10 00:11:26 +02:00
Jeremy Kescher
63e9572b94
Remove further leftover makeCustomEmojiMap references
2023-05-10 00:05:39 +02:00
Jeremy Kescher
a1395de405
Remove duplicate notification_mailer definition
2023-05-10 00:02:17 +02:00
Claire
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
Jeremy Kescher
f28f2bf216
Fix n+1 query for move emoji reaction settings migration
2023-05-10 00:00:06 +02:00
Jeremy Kescher
845d1be5ca
Run rubocop -a
2023-05-09 23:41:48 +02:00
Claire
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
Jeremy Kescher
f3c8de9379
Removed unused imports in status_container.js
2023-05-09 23:37:40 +02:00
Claire
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
Jeremy Kescher
3ecb6ce63e
Add back missing visibleReactions variable to both initial_state.js files
2023-05-09 23:37:34 +02:00
Renaud Chaput
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2023-05-09 23:28:40 +02:00
Renaud Chaput
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2023-05-09 23:20:57 +02:00
Jeremy Kescher
711fee1508
Add missing visible_reactions to vanilla initial_state typedef
2023-05-09 23:20:44 +02:00
Renaud Chaput
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
Jeremy Kescher
010569da7b
Fix max_reactions typedef
2023-05-09 23:18:20 +02:00
fusagiko / takayamaki
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2023-05-09 23:16:23 +02:00
Claire
1a664560cc
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We deleted it.
Kept it removed.
- `app/javascript/packs/public.jsx`:
Upstream changed an import, we have slightly different ones.
Ported upstream changes.
2023-05-09 23:12:48 +02:00
Jeremy Kescher
42d494dda3
Move reaction endpoints from route.rb to api.rb
2023-05-09 23:08:13 +02:00
Claire
0fff2b67de
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
neatchee
81c3d63f01
Remove stale/missed references to makeCustomEmojiMap / EmojiMap
2023-05-09 22:58:59 +02:00
Jeremy Kescher
530167dff5
Reactions: Return 404 when status should not be visible, asynchronous unreact
2023-05-09 22:58:58 +02:00
Jeremy Kescher
5fd81b6144
Add missing authorization to ReactService
2023-05-09 22:58:58 +02:00
neatchee
6af0296abc
Restore loc files for non-English languages; CrowdIn should handle this
2023-05-09 22:58:58 +02:00
Jeremy Kescher
92d6dc61eb
Update emoji reaction patches
2023-05-09 22:58:58 +02:00
neatchee
214eee241b
Fix placement of reactions bar for new threading UI
2023-05-09 22:58:58 +02:00
Jeremy Kescher
5b7d1d5281
Migrate emoji reactions
2023-05-09 22:58:56 +02:00
neatchee
1b76bb6bcc
Remove old .js locale files accidentally restored during rebase
2023-05-09 22:58:42 +02:00
Ivan Rodriguez
55303adfef
Keep emoji picker within screen bounds
...
Adds the `flip` prop to `<Overlay>`. Fixes #40
2023-05-09 22:58:42 +02:00
neatchee
f577764472
Fix rebase issues
2023-05-09 22:58:42 +02:00
neatchee
a789208939
Per PR suggestion, split name and domain, and look for emoji ID, for unreact, so remote emoji's can be unreacted
2023-05-09 22:58:42 +02:00
fef
ba68e3e0dc
move emoji reaction strings to locales-glitch
2023-05-09 22:58:39 +02:00
Jeremy Kescher
d23b8adc8b
Fix status reactions preventing an on_cascade delete
2023-05-09 22:56:46 +02:00
fef
bec3c13cad
bypass reaction limit for foreign accounts
2023-05-09 22:56:46 +02:00
fef
9b2cfc3191
fix 404 when reacting with Keycap Number Sign
...
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
2023-05-09 22:56:46 +02:00
