Essem
c6f492b4cd
Merge remote-tracking branch 'upstream/main'
2023-06-05 23:44:57 -05:00
dependabot[bot]
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
Claire
5e876c2901
[Glitch] Fix null signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
y.takahashi
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
Claire
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
Essem
3ae88ab107
Change favicon to fit instance theming
2023-06-03 12:16:13 -05:00
Essem
f0e15bdb85
Merge remote-tracking branch 'upstream/main'
2023-06-03 12:15:36 -05:00
dependabot[bot]
89d6341c80
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00
Claire
14bb6bb29a
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
y.takahashi
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
Claire
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
2023-05-28 17:49:55 +02:00
Essem
b763a47623
Merge remote-tracking branch 'catstodon/feature/emoji_reactions'
2023-05-28 10:45:57 -05:00
Essem
7cbfc6b4ac
Merge remote-tracking branch 'upstream/main'
2023-05-28 10:40:04 -05:00
たいち ひ
6a592083f1
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port 4197b5e4c8
2023-05-28 17:15:21 +02:00
Renaud Chaput
0009b4b574
[Glitch] Update inconsistent defaultMessage
...
Port e58c36d308
2023-05-28 17:14:31 +02:00
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Eugen Rochko
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
2023-05-28 16:59:12 +02:00
Renaud Chaput
7bec63e6e2
[Glitch] Fix null signUp URL handling from #25014
...
Port 40b948a1fb
2023-05-28 16:52:16 +02:00
たいち ひ
017fbc7a74
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 7336f3648b
2023-05-28 16:48:17 +02:00
Claire
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
Claire
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
Claire
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
2023-05-28 15:09:28 +02:00
Claire
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
2023-05-28 15:06:29 +02:00
Claire
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
2023-05-28 14:56:24 +02:00
Claire
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
Claire
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Jeremy Kescher
3b3bfecba6
Fix translations
2023-05-27 14:12:04 +02:00
Jeremy Kescher
fd5e5a759e
Move status_reactions.js to status_reactions.jsx
2023-05-27 13:55:17 +02:00
Jeremy Kescher
55199ec150
Use named import for AnimatedNumber
2023-05-27 13:32:45 +02:00
Jeremy Kescher
956ce75185
eslint fix
2023-05-27 12:01:13 +02:00
Jeremy Kescher
4ba93c2c10
Remove further leftover makeCustomEmojiMap references
2023-05-27 12:01:13 +02:00
Jeremy Kescher
263f10fd3e
Removed unused imports in status_container.js
2023-05-27 12:01:13 +02:00
Jeremy Kescher
ffd8aa6a2a
Add back missing visibleReactions variable to both initial_state.js files
2023-05-27 12:01:13 +02:00
Jeremy Kescher
672c123211
Add missing visible_reactions to vanilla initial_state typedef
2023-05-27 12:01:13 +02:00
Jeremy Kescher
0859f5b511
Fix max_reactions typedef
2023-05-27 12:01:13 +02:00
neatchee
20da97252d
Remove stale/missed references to makeCustomEmojiMap / EmojiMap
2023-05-27 12:01:13 +02:00
neatchee
f08f3c9eb8
Restore loc files for non-English languages; CrowdIn should handle this
2023-05-27 12:01:13 +02:00
Jeremy Kescher
7f1b0f43e9
Update emoji reaction patches
2023-05-27 12:01:13 +02:00
neatchee
9133f5af9d
Fix placement of reactions bar for new threading UI
2023-05-27 12:01:13 +02:00
neatchee
8e71bfde83
Remove old .js locale files accidentally restored during rebase
2023-05-27 12:01:13 +02:00
Ivan Rodriguez
1987dd766a
Keep emoji picker within screen bounds
...
Adds the `flip` prop to `<Overlay>`. Fixes #40
2023-05-27 12:01:13 +02:00
neatchee
bbce42a7cb
Fix rebase issues
2023-05-27 12:01:13 +02:00
fef
5ec5a782d4
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-27 12:01:13 +02:00
fef
8d9105e4c2
fix status action bar after upstream changes
2023-05-27 12:01:13 +02:00
fef
e688fac3ec
properly disable reactions when not logged in
2023-05-27 12:01:13 +02:00
