Commit graph

1098 commits

Author SHA1 Message Date
Essem
eeee52b6c8
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-03-15 12:55:46 -05:00
Terry Garcia
9a1bd1c3e9 [Glitch] Switched bookmark and favourites around
Port a1347f456e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 21:07:55 +01:00
Claire
03ac84b0f4 [Glitch] Fix duplicate “Publish” button on mobile
Port b55fc883b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 21:07:10 +01: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
Essem
67bb8ea535
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-02-28 13:44:40 -06:00
Christian Schmidt
b632c5a55a [Glitch] Add lang attribute to preview card
Port 8000a8f230 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:43:57 +01:00
Claire
31455f05fb [Glitch] Add lang tag to native language names in language picker
Port 7207a98d39 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:37:05 +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
Nick Schonning
7e64eef73b [Glitch] Enable ESLint no-useless-escape
Port db2c58d47a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18 16:02:12 +01:00
Claire
587f6b3b06 [Glitch] Enable ESLint import recommended rules
Port eddfb33dfe to glitch-soc
2023-02-18 16:02:12 +01:00
Essem
7c50316b68
Merge branch 'feat/emoji_reactions' 2023-02-16 15:19:51 -06:00
Essem
784c49d854
wait a second 2023-02-16 15:12:09 -06:00
koyu
2bf445d1e4
Fixing some errors 2023-02-16 13:21:34 -06:00
koyu
d659e6e37e
Add alt text to GIFs 2023-02-16 13:19:43 -06:00
koyu
59b4901143
Hopefully fix GIF picker 2023-02-16 13:19:06 -06:00
koyu
cae29231b3
Disable content filter on GIFs 2023-02-16 13:18:59 -06:00
koyu
3545ebaf0f
Make GIF modal look nicer 2023-02-16 13:17:02 -06:00
koyu
cb0adf81f1
Move from Giphy to Tenor 2023-02-16 13:16:50 -06:00
koyu
4d57353991
Add translations, close button and make Giphy modal more beautiful 2023-02-16 13:14:18 -06:00
koyu
6da827ace9
Fix up some weird issues with file formats on Giphy (10MB warning) 2023-02-16 13:13:58 -06:00
koyu
84904de71c
Add Giphy support 2023-02-16 13:13:49 -06:00
Claire
58291b31fa [Glitch] Fix attached media uploads not being cleared when replying to a post
Port bae17ebe5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 20:04:45 +01:00
Christian Schmidt
2dfbdc3f9d [Glitch] Show spinner while loading follow requests
Port c1f32c9c14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 13:02:32 +01:00
Christian Schmidt
8fd6c36243 [Glitch] Spell check input fields
Port 67744ee779 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 12:59:48 +01:00
Eugen Rochko
95e2cab22e [Glitch] Add setting for status page URL
Port 8f590b0a21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 12:58:11 +01:00
Claire
fa433ac5a6 Further JS code style changes 2023-02-04 22:31:47 +01:00
Akira Ouchi
8ce02aa6e8 [Glitch] autofocus the compose form again on /share
Port e73b55184b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-03 20:58:15 +01:00
Nick Schonning
372fa3fe36 [Glitch] Update hasOwnProperty calls for ESLint
Port 131e6403cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-03 20:57:47 +01:00
Claire
155424e52f [Glitch] Run eslint --fix
I don't like it changing files this way, but it's basically what
c49213f0ea and a few others did.
2023-02-03 20:52:07 +01:00
Nick Schonning
ed7cb79723 [Glitch] Remove extra semicolons with ESLint autofix
Port d9088ef327 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-03 19:58:44 +01:00
Christian Schmidt
fb9c786baf [Glitch] Add lang attribute to image description textarea and poll option field
Port 2a4f2216d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-03 19:23:36 +01:00
Claire
d9a078e6d3
Add role badges to WebUI (#2096)
* [Glitch] Add role badges to WebUI

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Ensure role name remains readable

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-26 23:35:23 +01:00
neatchee
1e27826472 Fix rebase issues 2023-01-26 11:32:03 -08:00
neatchee
20abef6590
Allow users to set the trigger height for lengthy toot auto-collapse (#2070)
* Allow users to set the trigger height for lengthy toot autocollapse

Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered

Originally authored by Dean Bassett (github.com/deanveloper)

Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18

* Remove bad escape characters

* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity

* Update comments re: lengthy toot height

* Fix inconsistent indentation

* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
fef
76a519f83e properly disable reactions when not logged in 2023-01-25 13:51:13 -08:00
fef
1ad2c68912 fix image for new custom emoji reactions 2023-01-25 13:51:13 -08:00
fef
2ffa61db05 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-01-25 13:51:10 -08:00
fef
3956154a16 rename nop handler to handleNoOp
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2023-01-25 13:44:21 -08:00
fef
d61c47edb0 cleanup JS imports and other minor stuff 2023-01-25 13:44:20 -08:00
fef
6ff67a6775 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-01-25 13:39:00 -08:00
fef
20166444de 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-01-25 13:38:59 -08:00
fef
aa6abec827 cleanup frontend emoji reaction code 2023-01-25 13:32:36 -08:00
fef
cafc95381c move react button to action bar 2023-01-25 13:30:22 -08:00
fef
0f29c1fa8f cherry-pick emoji reaction changes 2023-01-25 13:23:43 -08:00
fef
9958664f55 show reactions in detailed status view 2023-01-25 11:51:21 -08:00
Claire
ffea668076 [Glitch] Fix missing filtering on some notification types
Port 98779535fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:43:19 +01:00
Claire
853d0f28c5 [Glitch] Add lang attribute to compose textarea and CW field
Port 83a8efa9ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:40:48 +01:00
Mina Her
78b822c61d [Glitch] Make <Audio> to handle volume change
Port 3cf60ba267 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:37:37 +01:00
Claire
3f74235ac5 [Glitch] Fix confusing wording in the sign in banner
Port 3588fbc766 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 17:59:06 +01:00
Connor Shea
00cc1536f2 [Glitch] Add listing of followed hashtags
Port 30e895299c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 17:58:18 +01:00