Claire
61f3e0e95e
Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-08 17:59:28 +02:00
Eugen Rochko
8bf9bd5ac8
[Glitch] Fix n+1 query in settings migration
...
Port 0ad2413b35
2023-05-08 16:15:10 +02:00
Eugen Rochko
75e28731a5
[Glitch] Fix transaction around settings migration
...
Port f1c1fa1411
2023-05-08 16:12:05 +02:00
fusagiko / takayamaki
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
Eugen Rochko
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
Claire
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
Nick Schonning
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
Christian Schmidt
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
fusagiko / takayamaki
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
Claire
16c5354b8c
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
たいち ひ
7c1305b3a4
Add TypeScript support for mastodon alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
たいち ひ
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
たいち ひ
a65d2d1045
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
たいち ひ
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
たいち ひ
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
Essem
a61794d914
Merge remote-tracking branch 'neatchee/feat/emoji_reactions'
2023-05-08 00:01:26 -05:00
neatchee
f560ee44e9
Fix appearance/show.html.haml
2023-05-07 16:52:52 -07:00
neatchee
5bd0c35304
Revert "Fix appearance/show.html.haml"
...
This reverts commit 34f9e54f9f
2023-05-07 16:30:59 -07:00
neatchee
eb68f6250c
Revert "Fix missed merge conflict text in version.rb"
...
This reverts commit 2a8b66ad40
2023-05-07 16:30:45 -07:00
neatchee
730878a587
Remove stale/missed references to makeCustomEmojiMap / EmojiMap
2023-05-07 16:26:37 -07:00
neatchee
2a8b66ad40
Fix missed merge conflict text in version.rb
2023-05-07 16:12:37 -07:00
Jeremy Kescher
4bd3c80038
Reactions: Return 404 when status should not be visible, asynchronous unreact
2023-05-07 15:36:34 -07:00
Jeremy Kescher
ec687d7edb
Remove failing skip_before_action from v1/custom_emojis_controller.rb
...
Fixes incorrect merge at 9eb149477a24daf6e17a72ef550c76d4cf6ad506
2023-05-07 15:36:06 -07:00
Jeremy Kescher
b0b593d525
Add missing authorization to ReactService
2023-05-07 15:34:48 -07:00
neatchee
fa0a5a70c7
Restore loc files for non-English languages; CrowdIn should handle this
2023-05-07 15:33:50 -07:00
Jeremy Kescher
e0db7dc35a
Update emoji reaction patches
2023-05-07 15:27:26 -07:00
neatchee
7d7eff8f75
Restoring missing db migrate for reactions. How did this even go missing???
2023-05-07 15:08:26 -07:00
neatchee
759a27781d
Fix placement of reactions bar for new threading UI
2023-05-07 15:08:26 -07:00
Jeremy Kescher
34f9e54f9f
Fix appearance/show.html.haml
2023-05-07 15:08:26 -07:00
Jeremy Kescher
0c230226e4
Migrate emoji reactions
2023-05-07 15:08:26 -07:00
neatchee
f718c027b0
Remove old .js locale files accidentally restored during rebase
2023-05-07 15:08:26 -07:00
Ivan Rodriguez
b78ea8b4a3
Keep emoji picker within screen bounds
...
Adds the `flip` prop to `<Overlay>`. Fixes #40
2023-05-07 15:08:26 -07:00
neatchee
98eab315c1
Fix rebase issues
2023-05-07 15:08:26 -07:00
neatchee
26646218c7
Per PR suggestion, split name and domain, and look for emoji ID, for unreact, so remote emoji's can be unreacted
2023-05-07 15:08:26 -07:00
fef
49b25c5153
move emoji reaction strings to locales-glitch
2023-05-07 15:08:26 -07:00
Jeremy Kescher
b753263ba7
Fix status reactions preventing an on_cascade delete
2023-05-07 15:08:26 -07:00
fef
275a67b5a3
bypass reaction limit for foreign accounts
2023-05-07 15:08:26 -07:00
fef
79ff467687
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-07 15:08:26 -07:00
fef
4761bd3e69
fix status action bar after upstream changes
2023-05-07 15:08:26 -07:00
fef
ed60e5b915
fix schema after rebase
2023-05-07 15:08:26 -07:00
fef
215a76cca0
delete reaction notifications when deleting status
2023-05-07 15:08:26 -07:00
fef
3eab0d0cd0
support reacting with foreign custom emojis
2023-05-07 15:08:26 -07:00
fef
f6b1ec0f3d
properly disable reactions when not logged in
2023-05-07 15:08:26 -07:00
fef
13b5375fb7
serialize custom emoji reactions properly for AP
...
Akkoma and possibly others expect the `tag` field
in an EmojiReact activity to be an array, not just
a single object, so it's being wrapped into one
now. I'm not entirely sure whether this is the
idiomatic way of doing it tbh, but it works fine.
2023-05-07 15:08:26 -07:00
fef
588315ab24
also disable reaction buttons in vanilla flavour
2023-05-07 15:08:26 -07:00
fef
6a1c43856e
disable reaction button when not signed in
2023-05-07 15:08:26 -07:00
