mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-03 09:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21382 commits 5 branches 147 tags 265 MiB
Commit graph

238 commits

Author SHA1 Message Date
Jeremy Kescher
004b22602b
Merge branch 'emoji-reactions-base' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/styles/components.scss
 2024-02-24 11:08:13 +01:00
Claire
0a2b95c4f5
Adopt upstream's design for preview cards (#2634) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
 2024-02-19 22:47:01 +01:00
Jeremy Kescher
e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR 2024-02-16 15:12:22 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop 2024-01-28 02:29:46 +01:00
Claire
54ece5040d [Glitch] Use active variants for boost icons and increase icon size 
Port 5a838ceaa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:53:53 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop 2024-01-17 22:37:29 +01:00
Renaud Chaput
5b67389bba [Glitch] Add a new @/ alias for the root frontend directory and use it where possible 
Port 01b6c83c36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-16 12:21:13 +01:00
Claire
a1920425ca [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons 
Port 6bbcd9348e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:53:08 +01:00
Renaud Chaput
8cad0a4d6b [Glitch] Change icon SVG imports to use a default import 
Port 608f66f978 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:20:38 +01:00
Jeremy Kescher
3c8b9a7784
Set heart_plus as reaction button icon 2024-01-14 18:16:26 +01:00
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8 2024-01-14 17:48:42 +01:00
Eugen Rochko
a8c59c2506 [Glitch] Add icons for private and disabled boost in web UI 
Port 7e3c10dec6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +01:00
Eugen Rochko
6230d50f3f [Glitch] Fix various icon styles in web UI 
Port fa7e64df1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +01:00
Eugen Rochko
d54414866c [Glitch] Change icons in web UI 
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +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
Claire
7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working 
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-10 18:02:37 +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
408d4710ed Further reduce differences with upstream 2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream (#2509) 2023-12-09 20:29:23 +01:00
Claire
0c727a6790 Fix more import style 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
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
Claire
99c72830bc [Glitch] Fix scroll position in thread view reseting when closing a modal 
Port 9d1c3d0678 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-10 19:53:59 +02:00
Claire
05159d2f94 [Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread 
Port 4c2aca777f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:15:59 +02:00
Claire
b63d526590 [Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread 
Port c310374a2f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-09 21:11:44 +02:00
Christian Schmidt
def58f8ac3 [Glitch] Fix some React warnings 
Port 152b10b624 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire
128daefc7a
Remove leftover .orig files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
Christian Schmidt
1461cc53ed [Glitch] Add alt text for preview card thumbnails 
Port 8da99ffb0d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 18:56:58 +02:00
Claire
aa1789f0dd [Glitch] Change interaction modal in web UI 
Port b4e739ff0f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 16:59:32 +02:00
Eugen Rochko
e48a6a5f2c [Glitch] Fix missing action label on sensitive videos and embeds in web UI 
Port 714a20697f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 15:50:53 +02:00
gunchleoc
09ebf7e37c [Glitch] Replace 'favourite' by 'favorite' for American English 
Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 14:44:36 +02:00
Claire
5914dfdd69 [Glitch] Change thread view to scroll to the selected post rather than the post being replied to 
Port e4ea80d808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-30 14:26:52 +02:00
Eugen Rochko
f0d3267fbf [Glitch] Fix dropdowns being disabled for logged out users in web UI 
Port a8edbcf963 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-14 13:01:31 +02:00
Claire
a98b5c2246 [Glitch] Fix embed dropdown menu item for unauthenticated users 
Port 41f65edb21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 22:42:15 +02:00
Eugen Rochko
b3f209370b [Glitch] Add canonical link tags in web UI 
Port 000b835803 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:41:52 +02:00
alfe
9bf63257fb [Glitch] Rewrite <LoadingIndicator/> as FC and TS (#25364) 
Port a86886b1fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:10:37 +02:00
Plastikmensch
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) 
Port 68a192e718 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-11 13:33:45 +02:00
Claire
20718a8b59 Fix some translation strings inconsistencies 2023-06-10 19:21:44 +02:00
Eugen Rochko
fb0d2de8fe [Glitch] Change design of dropdowns in web UI 
Port e4fd9503ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 17:10:06 +02:00
Jed Fox
753385d3e0 [Glitch] Fix spacing of middle dots in the detailed status meta section 
Port acc419b81b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:29:48 +02: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
y.takahashi
4993b6e800 [Glitch] Handle Surrogate Pairs in truncate() 
Port 64b960b6b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:02 +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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:49:55 +02:00
Renaud Chaput
0009b4b574 [Glitch] Update inconsistent defaultMessage 
Port e58c36d308 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:14:31 +02:00
Eugen Rochko
e7dc375aab [Glitch] Change share action from being in action bar to being in dropdown in web UI 
Port 1caa5ff39e to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:59:12 +02:00