Essem
5fdd18ead1
Merge remote-tracking branch 'upstream/main'
2023-12-20 15:01:05 -06: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
Essem
ce1c652623
Merge remote-tracking branch 'upstream/main'
2023-12-10 23:28:41 -06:00
Claire
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
Essem
8d611ef932
Merge remote-tracking branch 'upstream/main'
2023-11-16 18:12:13 -06:00
Essem
19def877be
Merge remote-tracking branch 'upstream/main'
2023-11-15 11:04:05 -06:00
Claire
1023c2f90b
Fix more whitespace and comment discrepancies
2023-11-15 17:16:21 +01:00
Claire
c226d00490
Fix interaction between CWs and hashtag bars
2023-11-15 12:56:58 +01:00
Renaud Chaput
18462ee4b6
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +01:00
Claire
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 12:56:58 +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
Essem
0868c11651
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-30 14:42:53 -05:00
Claire
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:03:16 +02:00
Renaud Chaput
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-21 22:14:24 +02:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main'
2023-09-04 19:00:18 -05:00
Claire
023673c0d9
[Glitch] Add data-nosnippet
attribute to remote posts and local posts with noindex
...
Port c3a42e1280
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:49:35 +02:00
Essem
1fe16ad546
Merge remote-tracking branch 'claire/glitch-soc/merge-upstream'
2023-08-27 00:24:46 -05:00
Claire
9b958a707f
Fix interaction between CWs and hashtag bars
2023-08-25 21:54:15 +02:00
Renaud Chaput
7402adf6e2
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:38:24 +02:00
Claire
f5a557a4b9
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:18:48 +02:00
Essem
bda3bbf777
Merge remote-tracking branch 'upstream/main'
2023-06-14 19:34:26 -05:00
Christian Schmidt
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:48:41 +02:00
Essem
f0e15bdb85
Merge remote-tracking branch 'upstream/main'
2023-06-03 12:15:36 -05:00
Essem
7cbfc6b4ac
Merge remote-tracking branch 'upstream/main'
2023-05-28 10:40:04 -05:00
Claire
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
to glitch-soc
2023-05-28 16:38:10 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
to glitch-soc
2023-05-28 14:18:43 +02:00
Christian Schmidt
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:57:19 +02:00
Claire
cb6f445b90
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
fef
b46adb9a1d
properly disable reactions when not logged in
2023-05-09 22:56:07 +02:00
fef
83bffa8b3c
display external custom emoji reactions properly
...
Using an emoji map was completely unnecessary in
the first place, because the reaction list from
the API response includes URLs for every custom
emoji anyway. The reaction list now also contains
a boolean field indicating whether it is an
external custom emoji, which is required because
people should only be able to react with Unicode
emojis and local custom ones, not with custom
emojis from other servers.
2023-05-09 22:55:28 +02:00
fef
5d5fd9457d
make number of visible reactions a vanilla setting
...
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2023-05-09 22:54:33 +02:00
fef
4d7340472b
make number of displayed reactions a setting
...
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
2023-05-09 22:53:50 +02:00
fef
46179ed6be
cleanup frontend emoji reaction code
2023-05-09 22:53:23 +02:00
fef
c5befd7c1a
cherry-pick emoji reaction changes
2023-05-09 22:53:21 +02:00
fef
a445e38694
add frontend for emoji reactions
...
this is still pretty bare bones but hey, it works.
2023-05-09 22:51:38 +02:00
Claire
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +02:00
Claire
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
Claire
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
Eugen Rochko
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:08:13 +02:00
Nick Schonning
bfe46d08f9
[Glitch] Ensure tabIndex is number instead of string
...
Port ec0c104bf2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 14:47:29 +02:00
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
to glitch-soc
2023-03-27 08:51:57 +02:00
Christian Schmidt
0e476f3c4f
[Glitch] Add lang
attribute to media and poll options
...
Port d3eefead30
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 17:52:53 +01:00
Renaud Chaput
81ef21a0c8
[Glitch] Rename JSX files with proper .jsx
extension
...
Port 44a7d87cb1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:35:31 +01:00