fef
57e46f4aaf
merge catstodon/main into main
2022-11-30 16:35:05 +00:00
fef
4571ee9da6
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.
2022-11-30 14:59:37 +00:00
fef
96cd869dad
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.
2022-11-30 13:20:20 +00:00
fef
80a2f84334
cleanup frontend emoji reaction code
2022-11-29 08:54:35 +00:00
fef
d6e3a9f17f
send reaction notifications
2022-11-29 03:31:22 +00:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6
2022-11-29 00:15:08 +01:00
Claire
98c5ca1037
[Glitch] Fix infinite loading instead of soft 404 for non-existing remote accounts
...
Port 3ffaa966b0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:55:56 +01:00
kedama
32b43a96a7
[Glitch] Fix status mismatch of sensitive check
...
Port 14e2354eea
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-28 11:53:21 +01:00
fef
9172df2fdf
add frontend for emoji reactions
...
this is still pretty bare bones but hey, it works.
2022-11-24 17:30:52 +00:00
Jeremy Kescher
122870cb6b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# config/initializers/rack_attack.rb
# lib/mastodon/version.rb
2022-11-14 22:18:48 +01:00
Claire
96c1ef6d50
[Glitch] Fix media metadata being only editable once
...
Port 2d54986a03
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 18:32:33 +01:00
Jeremy Kescher
c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2022-11-12 14:38:59 +01:00
Claire
9255bfb908
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port 31005aad12
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-12 14:01:47 +01:00
Jeremy Kescher
5b797a34df
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 23:30:01 +01:00
Claire
9b6d6a919f
[Glitch] Fix redrafting a currently-editing post not leaving edit mode
...
Port 782b6835f7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08 16:26:25 +01:00
Jeremy Kescher
03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# lib/mastodon/version.rb
# public/avatars/original/missing.png
2022-11-06 20:59:47 +01:00
Claire
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2022-11-01 10:29:44 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +01:00
Eugen Rochko
ebfe393e9c
[Glitch] Fix upload progress not communicating processing phase in web UI
...
Port 30ef110224
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:30:58 +01:00
Takeshi Umeda
8be350cc82
[Glitch] Add featured tags selector for WebUI
...
Port 4c7b5fb6c1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
f9f0949bd3
[Glitch] Fix case-sensitive look-up for profiles in web UI
...
Port 5e908c5a95
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
9363e5c24e
[Glitch] Change public accounts pages to mount the web UI
...
Port 839f893168
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Eugen Rochko
67b4ecdd21
[Glitch] Change about page to be mounted in the web UI
...
Port 1bd00036c2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Jeremy Kescher
e333716df0
Merge remote-tracking branch 'upstream/main' into develop
2022-10-13 22:39:25 +02:00
Claire
7e62688a0e
Fix notification cleaning mode causing notifications to get stuck ( #1868 )
2022-10-13 20:00:20 +02:00
Claire
27a2edcb79
Fix issues with notification cleaning mode when there is a disconnection gap ( #1867 )
2022-10-13 08:55:00 +02:00
Jeremy Kescher
b153ef2672
Merge remote-tracking branch 'upstream/main' into develop
2022-10-12 07:25:19 +02:00
Claire
18f210aff6
Fix accidentally importing vanilla code in glitch-soc flavor ( #1863 )
2022-10-11 19:35:37 +02:00
Claire
b728b25c10
Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji
2022-10-11 12:43:19 +02:00
Claire
b75bf336bd
Move more modules from flavours/glitch/utils to flavours/glitch
2022-10-11 12:25:45 +02:00
Claire
d3879c07b1
Rename flavours/glitch/util into flavours/glitch/utils
2022-10-11 11:31:11 +02:00
Claire
26b687160b
Move flavours/glitch/util/initial_state to flavours/glitch/initial_state
2022-10-11 10:17:04 +02:00
Jeremy Kescher
f314520459
Merge remote-tracking branch 'upstream/main' into develop
2022-10-10 06:45:32 +02:00
Eugen Rochko
757e16a0b5
[Glitch] Add server banner to web app
...
Port d2528b26b6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-09 20:26:15 +02:00
Jeremy Kescher
5da4f13737
Merge remote-tracking branch 'upstream/main' into develop
2022-10-09 12:13:47 +02:00
Eugen Rochko
da67e0660a
[Glitch] Add pagination for trending statuses in web UI
...
Port f382192862
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko
6e208a817d
[Glitch] Fix not showing loading indicator when searching in web UI
...
Port cb2e198d89
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko
058b74dc0a
[Glitch] Add explore page to web UI
...
Port d4592bbfcd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Eugen Rochko
870f0aae48
[Glitch] Fix pop-out player appearing on mobile screens in web UI
...
Port 18ca4e0e9a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-08 20:49:02 +02:00
Jeremy Kescher
7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop
2022-08-26 08:43:43 +02:00
Claire
43a1bfd05d
[Glitch] Fix “Filter this post” potentially listing deleted filters
...
Port 2cae5f5b8d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 18:18:34 +02:00
Claire
3844f15da0
Remove obsolete filter local settings
2022-08-25 09:52:13 +02:00
Claire
0b733ca790
[Glitch] Add ability to filter individual posts
...
Port 50487db122
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire
a15fe32e61
[Glitch] Revamp post filtering system
...
Port front-end changes from 02851848e9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:40:45 +02:00
Jeremy Kescher
71b46e3a86
Merge remote-tracking branch 'upstream/main' into develop
2022-08-25 08:57:30 +02:00
Claire
448ed92f76
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port afb8bc97d0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:16:43 +02:00
Jeremy Kescher
5206dddac7
Merge remote-tracking branch 'upstream/main' into develop
2022-08-21 18:01:10 +02:00
Shlee
8a93dd3d83
[Glitch] Update notifications.js
...
Port d92ce31c92
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-21 14:44:58 +02:00
Jeremy Kescher
e354a296c1
Web UI: Allow creating polls with only one option
2022-08-12 21:17:29 +02:00