Commit graph

890 commits

Author SHA1 Message Date
Essem
bda3bbf777
Merge remote-tracking branch 'upstream/main' 2023-06-14 19:34:26 -05: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
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
Claire
bf23afa059 [Glitch] Add card with who invited you to join when displaying rules on sign-up
Port SCSS from 0766c9a631 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 16:30:36 +02:00
Claire
9af04d5a46 [Glitch] Add a confirmation screen when suspending a domain
Port e9385e93e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 15:10:24 +02:00
Renaud Chaput
8188522bde [Glitch] Fix prev/next buttons color in media viewer
Port 675672feb6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:48:41 +02:00
Essem
7cbfc6b4ac
Merge remote-tracking branch 'upstream/main' 2023-05-28 10:40:04 -05:00
Claire
602ae7f2f6 [Glitch] Fix videos being improperly positioned on safari
Port 0eed06073f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-25 21:47:48 +02:00
Claire
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) (#2231)
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form (#2226) 2023-05-25 19:14:37 +02:00
Essem
2cf4b3a95b
Merge remote-tracking branch 'catstodon/feature/emoji_reactions' 2023-05-09 22:37:07 -05:00
neatchee
214eee241b
Fix placement of reactions bar for new threading UI 2023-05-09 22:58:58 +02:00
fef
a97b0fd62b
fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2023-05-09 22:55:28 +02:00
fef
2e312d28e8
fix reaction margins and paddings 2023-05-09 22:53:23 +02:00
fef
4653f9830d
fix padding for reaction button 2023-05-09 22:53:23 +02:00
Eugen Rochko
bbd0e9caa6 [Glitch] Add ALT badges to media that has alternative text in web UI
Port 8131a5b330 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 22:15:00 +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
10f5329ddf [Glitch] Fix incorrect box shadow on avatar in thread view
Port d37c0a1060 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 21:09:49 +02:00
Claire
f89f3a8566
Fix glitch-soc's thread line styling (#2214)
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2023-05-08 18:21:36 +02:00
Claire
e9eab013e7 [Glitch] Fix audio player width in thread view
Port cf1bc4bb93 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-08 15:50:05 +02:00
Essem
cd71462f92
Merge remote-tracking branch 'neatchee/feat/emoji_reactions' 2023-05-07 15:08:48 -05:00
Essem
708df4cc2a
Merge remote-tracking branch 'upstream/main' 2023-05-07 15:05:29 -05:00
Claire
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)
* Run eslint --fix

* Fix linting issues in video player and reduce divergences with upstream

This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.

* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`

Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.

* Fix linting issue and bug in streaming/index.js

* Fix linting issues in config/webpack/shared.js

* Fix unused import in flavours/glitch/features/ui/index.js

* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx

* Fix linting issues in flavours/glitch/reducers

* Fix linting issues in glitch-soc onboarding modal

* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx

* Remove dead code for unused local setting navbar_under

* Fix various linting issues

* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire
6f64c79ca4
Fix SCSS linting issues (#2207)
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons

* Run stylelint --fix

* Avoid `@extend` directives with doodle modal CSS

* Drop use of `@extend` for notification cleanup buttons SCSS

* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
neatchee
3fffa8a04b Fix placement of reactions bar for new threading UI 2023-05-07 01:10:49 -07:00
fef
35ff0c4d94 fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2023-05-07 01:01:49 -07:00
fef
e220736cac fix reaction margins and paddings 2023-05-07 00:58:56 -07:00
fef
896ed10527 fix padding for reaction button 2023-05-07 00:58:28 -07:00
Essem
94c2fae695
Merge remote-tracking branch 'upstream/main' 2023-05-02 13:13:59 -05:00
Eugen Rochko
38eeed6cbf [Glitch] Change logo version in header based on screen size in web UI
Port 6028d047b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 18:54:13 +02:00
Claire
cb97a92954 [Glitch] Fix thread lines in right-to-left locales (#24714)
Port 105f8687e4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:21:44 +02:00
Claire
103b6de8b2 [Glitch] Fix sass warning about deprecated slash as division (#24653)
Port 1527b02c6d to glitch-soc

Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 12:17:06 +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
Chike Nwaenie
374a109546 [Glitch] Change styling of the recommended accounts to allow bio to be more visible
Port e1b4eeb636 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:28:24 +02:00
Christian Schmidt
0091b28ffe [Glitch] Use CSS to trim long card descriptions
Port e713c545b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-29 11:26:58 +02:00
Plastikmensch
678480d4d3
Fix small mistakes in RTL layout (#2182)
Borders in blockquotes in reply-indicator weren't colored properly.

avatar margin when viewing edited toots dropdown was applied to wrong side.

Conversations had padding applied to the wrong side.

Padding for notifcation cleaner checkboxes was applied to wrong side.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
Plastikmensch
aea7866161
Change drawer--header to drawer__header (#2189)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Eugen Rochko
2f3dffb057 [Glitch] Add progress indicator to sign-up flow
Port e5c0b16735 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-22 10:18:20 +02:00
Essem
2b892698ec
Merge remote-tracking branch 'upstream/main' 2023-04-19 12:24:54 -05:00
Essem
7b70fabb10
Revert "Merge remote-tracking branch 'vyr/extended-search-final-glitch'"
This reverts commit 734b252307, reversing
changes made to 445f81cbbb.
2023-04-19 12:22:10 -05:00
Claire
a3c05640f7 [Glitch] Add “In Memoriam” banner back to profiles
Port 86ad43173f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-16 18:02:16 +02:00
Claire
cb0562f32c [Glitch] Fix tab arrows on RTL layouts
Port af49d93fd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-16 17:58:32 +02:00
Plastikmensch
f28942cef9
[Glitch] Refactor styles to use logical properties for positioning (#2156)
Port babd86e594 and 45848d6547 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-16 17:45:18 +02:00
Essem
734b252307
Merge remote-tracking branch 'vyr/extended-search-final-glitch' 2023-04-11 21:59:54 -05:00
Vyr Cossont
7ef3e28a95 Add search reference page to Glitch UI 2023-04-11 11:02:02 -07:00
Essem
04f418672a
Merge remote-tracking branch 'neatchee/feat/emoji_reactions' 2023-04-10 15:20:30 -05:00
Essem
d8e2598ae2
Merge remote-tracking branch 'upstream/main' 2023-04-10 15:12:42 -05:00
Christian Schmidt
53cdcce3d1 [Glitch] Fix loading spinner + infinite scroll for private mentions
Port 9ef9974ff2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:10:01 +02:00
Nick Schonning
b756e49cf1 [Glitch] Enable Stylelint property-no-unknown
Port cd14f712ad to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:05:55 +02:00
Christian Schmidt
df6602ede1 [Glitch] Fix account header image missing in low-res
Port d7b8c6db7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:01:55 +02:00
fef
77e2cc11ff fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2023-04-04 15:21:12 -07:00
fef
5ada827029 fix reaction margins and paddings 2023-04-04 15:18:14 -07:00
fef
2d8e3e9b9b fix padding for reaction button 2023-04-04 15:18:14 -07:00
Rubicon Rowe
69ca6316ec [Glitch] Fix inconsistent radius in drawer
Port fa98363a27 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04 12:51:24 +02:00
Essem
2017add317
Merge remote-tracking branch 'upstream/main' 2023-03-27 11:58:10 -05:00
mogamin
b4f60bc6de [Glitch] Fit the max-width of media in .prose to parent box
Port 0a9def5498 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-22 20:00:33 +01:00
Essem
7868fead64
Squashed commit of the following:
commit 13bca8d5b7344445633ff3c8a162086be8215379
Merge: 1e2782647 ff157b237
Author: Essem <smswessem@gmail.com>
Date:   Thu Mar 16 11:51:32 2023 -0500

    Merge branch 'feat/emoji_reactions' of https://github.com/neatchee/mastodon into feat/emoji_reactions

commit ff157b2378a15a786763d7e13ad2de4ff223dc03
Author: neatchee <neatchee@gmail.com>
Date:   Wed Mar 8 13:27:25 2023 -0800

    Remove old .js locale files accidentally restored during rebase

commit 52beb88a19626c0b17d0945a43bf8725ceae4b04
Author: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Date:   Tue Mar 7 23:21:32 2023 -0600

    Keep emoji picker within screen bounds

    Adds the `flip` prop to `<Overlay>`. Fixes #40

commit 7707004cf3d5bacd3ef830ef734dd003b607c2af
Author: neatchee <neatchee@gmail.com>
Date:   Thu Jan 26 11:32:03 2023 -0800

    Fix rebase issues

commit ce40bbbce1e5e9ab7770f89dd7cffd87d3ceb177
Author: neatchee <neatchee@gmail.com>
Date:   Thu Jan 26 10:22:15 2023 -0800

    Per PR suggestion, split name and domain, and look for emoji ID, for unreact, so remote emoji's can be unreacted

commit fc9f34a39fa40b3eda4ccfc0cc8e5c028b9ebe79
Author: fef <owo@fef.moe>
Date:   Tue Dec 20 17:19:56 2022 +0000

    move emoji reaction strings to locales-glitch

commit af0f50ca74631e9f2dafde0f0e08417f906c04a0
Author: Jeremy Kescher <jeremy@kescher.at>
Date:   Sun Dec 18 04:23:42 2022 +0100

    Fix status reactions preventing an on_cascade delete

commit 2e713c7792438f17ef026f6d79465be25a5fb7db
Author: fef <owo@fef.moe>
Date:   Thu Dec 15 15:27:54 2022 +0000

    bypass reaction limit for foreign accounts

commit 907e1e490ed9b2373eb18f92af9fda4426274713
Author: fef <owo@fef.moe>
Date:   Sun Dec 11 13:26:23 2022 +0000

    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.

commit 9028d3841f7d5d2eb1b06bc210ded055c53fc1d2
Author: fef <owo@fef.moe>
Date:   Thu Dec 8 09:48:55 2022 +0000

    fix status action bar after upstream changes

commit 4ce5095d8c187947805ecf21c90ad494440e904a
Author: fef <owo@fef.moe>
Date:   Wed Dec 7 21:52:53 2022 +0100

    fix schema after rebase

commit 63b9e4392adbb13fe0ce71de4d28419df0f36bb1
Author: fef <owo@fef.moe>
Date:   Wed Dec 7 12:47:03 2022 +0000

    delete reaction notifications when deleting status

commit e407cc12b64a664c66717ce06d65342dd8bc609e
Author: fef <owo@fef.moe>
Date:   Wed Dec 7 12:19:36 2022 +0000

    support reacting with foreign custom emojis

commit b2dbb4dbe4996426a6cdb90e8da27e5096b3e88c
Author: fef <owo@fef.moe>
Date:   Sun Dec 4 12:33:47 2022 +0000

    properly disable reactions when not logged in

commit ec790f3b1e243e33ccd22685b8e3c017ca7f9273
Author: fef <owo@fef.moe>
Date:   Sun Dec 4 10:52:02 2022 +0000

    serialize custom emoji reactions properly for AP

    Akkoma and possibly others expect the `tag` field
    in an EmojiReact activity to be an array, not just
    a single object, so it's being wrapped into one
    now.  I'm not entirely sure whether this is the
    idiomatic way of doing it tbh, but it works fine.

commit 2637d9b77a6e696face0851328c5bd2e80d1dab2
Author: fef <owo@fef.moe>
Date:   Sun Dec 4 08:47:24 2022 +0000

    also disable reaction buttons in vanilla flavour

commit 0b4d5f700b74c0a6c8344321e491082511128f48
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 16:55:37 2022 +0000

    disable reaction button when not signed in

commit afd0bb2c05be38477df1a808b32cece5c7e4b416
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 16:20:29 2022 +0000

    fix image for new custom emoji reactions

commit b1dcd0eb6ce2f097fab310cdf32cd509426fcfba
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 14:23:55 2022 +0000

    run i18n-tasks normalize

commit e4e7837bf30082185b2f14e8d60741261f7085f4
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 11:57:00 2022 +0000

    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.

commit 6d3e364fa22370ab80f16a311dce15d93976464a
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 10:22:15 2022 +0000

    handle incoming custom emoji reactions properly

commit 0a47a05905adc3e9d1dc1e7e619891b884b9e512
Author: fef <owo@fef.moe>
Date:   Sat Dec 3 08:24:23 2022 +0000

    support Undo action for EmojiReaction

commit b81f4537aced99e427cb30fd54a33c852839e08a
Author: fef <owo@fef.moe>
Date:   Fri Dec 2 17:02:06 2022 +0000

    download remote custom emojis from reactions

    Emoji reactions containing custom emojis from
    remote instances were assumed to already have
    been downloaded and stored in the database.
    This might obviously not be the case.

commit ff246bda3731753f58f7e499aae036c331953d0b
Author: fef <owo@fef.moe>
Date:   Fri Dec 2 10:17:59 2022 +0000

    fix integer cast bug

    Gotta love Rails.

commit 40a645aab9e8071698051751d88262bb9e10199a
Author: fef <owo@fef.moe>
Date:   Fri Dec 2 09:37:56 2022 +0000

    sanitize setting for number of visible reactions

    This is kind of a hack, but the lack of
    validation for settings unfortunately makes it
    necessary.

commit 391c6e22f2170f990d30d975c4a5ffb966484c17
Author: Jeremy Kescher <jeremy@kescher.at>
Date:   Fri Dec 2 08:05:10 2022 +0100

    Add reaction limit to instance serializer

commit 501ae9e2e1578ef80709ff38910dc46f483c5942
Author: fef <owo@fef.moe>
Date:   Fri Dec 2 01:52:59 2022 +0000

    fix padding on posts without reactions

    The margins of the elements above and below the
    main reaction list element overlapped before
    reactions were added.  Adding display: none to
    empty reaction bars restores this exact look.

commit 956edd3ca7cd04a3524addc2c5b6ddc475358734
Author: fef <owo@fef.moe>
Date:   Fri Dec 2 01:00:08 2022 +0000

    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.

commit 2c93f1840f6cc74eef628b370b2c7b8485028cc8
Author: fef <owo@fef.moe>
Date:   Thu Dec 1 23:30:39 2022 +0100

    cleanup JS imports and other minor stuff

commit 4a2f91e3de2dfdb53e1a3f09430c6e0eabbf49be
Author: fef <owo@fef.moe>
Date:   Thu Dec 1 04:26:13 2022 +0000

    remove unnecessary parameter

commit 91d26c871786708f8c2c0188f82318ff2c438127
Author: fef <owo@fef.moe>
Date:   Thu Dec 1 02:24:08 2022 +0000

    change reaction api to match other interactions

    Status reactions had an API similar to that of
    announcement reactions, using PUT and DELETE at a
    single endpoint.  I believe that for statuses, it
    makes more sense to follow the convention of the
    other interactions and use separate POST endpoints
    for create and destroy respectively.

commit c74e050e3d77920000d7226ae26966d27291e790
Author: fef <owo@fef.moe>
Date:   Thu Dec 1 01:41:47 2022 +0000

    fix reaction deletion bug and clean up controller

    Turns out the strange error where it would delete
    the wrong reaction occurred because I forgot to
    pass the emoji name to the query, which resulted
    in the database deleting the first reaction it
    found.  Also, this removes the unused set_reaction
    callback and includes the Authorization module for
    the status reactions controller.

commit e7ed7e37d7995d4bf39ad44c7a738290c81fa9dc
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 19:29:56 2022 +0000

    remove outdated comments

commit d33f8330c019898f948334453b75fc2802fab9f8
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 17:09:16 2022 +0000

    clean up new imports in vanilla flavour

commit 45f803e23f019dbe5246daa3131548acdb99a757
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 17:25:36 2022 +0100

    rebase with upstream

commit 8b339e4a2d2632a269dccdba1a60e69b6b38a053
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 14:59:37 2022 +0000

    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.

commit 56323209b519a90f9dbf10b1c45a320de4d6aaa5
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 13:20:20 2022 +0000

    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.

commit e96fb97770877749b5c6bca8fe3e6136fffa309a
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 12:01:34 2022 +0000

    change default reaction limit to 1

commit 30ae2ad2612bae2abb48c49205bbe71b97435dda
Author: fef <owo@fef.moe>
Date:   Wed Nov 30 09:06:14 2022 +0000

    limit number of reactions displayed

    Too many reactions on a single post quickly get
    spammy, so they are now sorted by count and only
    the first MAX_REACTIONS number of different
    emojis are actually displayed.

commit 84fb0f3cc252cabfa374b31f8a34e021a3ad8677
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 09:07:10 2022 +0000

    fix reaction margins and paddings

commit 53b685ff1d4589915655da5cafa3a2dd9ee06a51
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 08:54:35 2022 +0000

    cleanup frontend emoji reaction code

commit 2b0a474a73a84a3e841ddf44854fa5c2e0681a0f
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 08:15:52 2022 +0000

    cleanup backend emoji reaction code

commit 3bfd5ceba17c42bee27ff0f10514332caa814332
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 06:25:43 2022 +0000

    fix padding for reaction button

commit deabc28e182acc208bffe6fb57430b97c5bc7c6c
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 05:21:53 2022 +0000

    handle misskey reactions properly

    misskey federates emoji reactions as likes.

commit 4d47b9929852493b208fdf13dee38e27dde50b8c
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 04:37:44 2022 +0000

    move react button to action bar

commit 151bcea7d4497086823adc0bca6c674ea78a8d8f
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 04:31:22 2022 +0100

    cherry-pick emoji reaction changes

commit f150fd0dc8761c2a992875948a2736244e5f7076
Author: fef <owo@fef.moe>
Date:   Tue Nov 29 00:39:40 2022 +0000

    make frontend fetch reaction limit

    the maximum number of reactions was previously
    hardcoded to 8.  this commit also fixes an
    incorrect query in StatusReactionValidator where
    it didn't count per-user reactions but the total
    amount of different ones.

commit 12886aa19ae5be6c7077ff1704b1b4c75c15eae6
Author: fef <owo@fef.moe>
Date:   Mon Nov 28 23:16:56 2022 +0000

    make status reaction count limit configurable

commit 25806c568a57e9193b43427df80b60a88143a5eb
Author: fef <owo@fef.moe>
Date:   Mon Nov 28 22:25:12 2022 +0000

    remove accidentally created file

commit f3784cfef551ad1d9d0df0001b2b480bfc656b14
Author: fef <owo@fef.moe>
Date:   Mon Nov 28 22:23:13 2022 +0000

    federate emoji reactions

    this is kind of experimental, but it should work
    in theory.  at least i tested it with a remove
    akkoma instance and it didn't crash.

commit d32f3f8c2fb9e8a29e676e54c98d2cac85841728
Author: fef <owo@fef.moe>
Date:   Fri Nov 25 23:02:40 2022 +0000

    show reactions in detailed status view

commit 5e9bbb0be253b5b56c6d7b5ee8d843f401995b7c
Author: fef <owo@fef.moe>
Date:   Thu Nov 24 17:30:52 2022 +0000

    add frontend for emoji reactions

    this is still pretty bare bones but hey, it works.

commit 85756b572a169857a09d7668ce9f2c856ebefd27
Author: fef <owo@fef.moe>
Date:   Thu Nov 24 11:50:32 2022 +0000

    add backend support for status emoji reactions

    turns out we can just reuse the code for
    announcement reactions.
2023-03-16 11:54:49 -05:00
Essem
eeee52b6c8
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-03-15 12:55:46 -05:00
Rodion Borisov
32418f0ff3 [Glitch] Center the text itself in upload area
Port a52ccd7ad9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15 09:33:48 +01:00
Claire
7f3b0dedeb Refactor glitch-soc rich text SCSS 2023-03-05 21:31:45 +01:00
Essem
67bb8ea535
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-02-28 13:44:40 -06:00
Claire
b91756fd4d Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire
cc94cc86ae Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Tim Lucas
28cb77bd07 [Glitch] Increase contrast of upload progress background
Port f4f91bc295 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:43:24 +01:00
Botao Wang
56bec60f25 [Glitch] Fix sidebar cut-off on small screens in admin UI
Port 7adde24a95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25 14:40:29 +01:00
Nick Schonning
ea9a1d79df [Glitch] Upgrade to Stylelint 15 with Prettier
Port 0c9d455ea5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18 16:02:12 +01:00
Essem
7c50316b68
Merge branch 'feat/emoji_reactions' 2023-02-16 15:19:51 -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
84904de71c
Add Giphy support 2023-02-16 13:13:49 -06:00
cadars
5e37906083 [Glitch] Add scrolling to Compare history modal
Port e8cb3ee827 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 13:03:41 +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
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
0f59ce3e56 fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2023-01-25 13:44:21 -08:00
fef
fff8112a5f fix reaction margins and paddings 2023-01-25 13:32:37 -08:00
fef
26972e3947 fix padding for reaction button 2023-01-25 13:30:24 -08:00
Claire
2093436349 [Glitch] Fix styling of featured tags in light theme
Port e5ae75bf6a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-25 17:27:23 +01:00
Claire
cf3ad10e75 [Glitch] Fix upload area display in single-column mode
Port 54e798a5a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:36:59 +01:00
Eugen Rochko
a4090ab646 [Glitch] Fix wrong text color on some buttons in light theme in web UI
Port 13e9d91ba7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-21 15:08:51 +01:00
Eugen Rochko
0d20b38da7 [Glitch] Fix wrong padding in RTL layout in web UI
Port part of 4894deca7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-21 15:07:52 +01:00
Claire
26c2b401a5
Fix missing admin CSS in glitch-soc flavor (#2088)
Port SCSS changes from 43f56f1291

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-01-18 18:54:04 +01:00
Claire
9b4afb320a [Glitch] Change account moderation notes to make links clickable
Port 9b3e22c40d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 17:49:29 +01:00
Peter Simonsson
9205b4e32f [Glitch] Add checkmark symbol to checkbox
Port 7e6ffa085f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 17:48:48 +01:00
Claire
598888a7c4 [Glitch] Remove hardcoded width from dropdown overlays
Port f4a6365f55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12 17:48:10 +01:00
Peter Simonsson
a36dfbb2aa [Glitch] Fix dropdown menu positions when scrolling
Port fd33bcb3b2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12 11:18:22 +01:00
Jed Fox
1702907a9d [Glitch] Improve the contrast of the chart in “poll has ended” notifications
Port b81b646e3b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-05 15:11:23 +01:00
Darius Kazemi
476c131946 [Glitch] Replace flex styling with sensible layout rules
Port ef4d29c879 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-02 17:32:29 +01:00
Plastikmensch
08837f730d
Use wrapper div as a spacer (#2046)
Keeps the alignment of timestamps, while also reducing clickable size

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 18:59:20 +01:00
Plastikmensch
4b51d1386b
Realign timestamps (#2044)
Add missing display and overflow properties.

Fixes misaligned timestamps and missing overflow in search.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-23 12:35:03 +01:00
prplecake
6cde3dd08b
Wraps status timestamps in a div (#2038)
* Wraps status timestamps in a `div`

Fixes #1985

This wraps the status timestamp in a `div` to reduce the clickable
target size of the link. The `div` gets a `margin: 0 0 0 auto` to stick
it to the right margin of the status.

* Update app/javascript/flavours/glitch/styles/components/status.scss

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-12-22 15:18:02 +01:00
Claire
0912fb736d [Glitch] Add follow request banner on account header
Port 70415714f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:11:32 +01:00
Terence Eden
89d3d85cf2 [Glitch] Add transparancy to modal background for accessibility
Port ff414a5489 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:04:20 +01:00
Mina Her
0f5ecb3860 [Glitch] Fix margin for search field on medium window size
Port cedf138313 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:03:14 +01:00
Claire
602f18103c [Glitch] Fix the top action bar appearing in multi-column layout
Port 38596e49d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:59:59 +01:00
Connor Shea
e76fb9b2c4 [Glitch] Increase the width of the unread notification border.
Port 08c0e43b6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:22 +01:00
Riedler
8cd7b95559 [Glitch] Fix profile avatar being slightly offset into left border
Port c3388f4ab1 to glitch-soc

Co-authored-by: Riedler <riedler@gelse.eu>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:49:15 +01:00
Claire
ccc01559de Fix invalid CSS for links in warning and strike cards 2022-12-14 10:11:04 +01:00
Rin
21ee6a777d [Glitch] fix missing style in warning and strike cards
Port 42e16ea52d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:26:27 +01:00
cadars
32b8b3355b [Glitch] Make handle more easily selectable on profile page
Port 52a50c5e43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-14 09:19:23 +01:00