Essem
|
4edbebfbac
|
Fix reaction picker dropdown appearance
|
2024-02-25 18:16:15 +01:00 |
|
Jeremy Kescher
|
77d74465af
|
Remove useless "inverted" prop
|
2024-02-24 19:36:31 +01:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
Jeremy Kescher
|
8f8cb0fad3
|
Merge branch 'glitch-soc' into develop
|
2024-02-24 17:51:18 +01:00 |
|
Claire
|
3ffb81e04f
|
[Glitch] Add end-to-end test for OCR in media uploads
Port ca8fbda5d0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 16:13:13 +01:00 |
|
Claire
|
ad0be125f5
|
[Glitch] Fix pixel alignment for some composer icons
Port 25ffe0af45 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 15:53:42 +01:00 |
|
Yamagishi Kazutoshi
|
b4cca47f5f
|
[Glitch] Remove unused l18n messages
Port b3075a9993 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:19:26 +01:00 |
|
J H
|
4d6844eb2f
|
[Glitch] Fixed the toggle emoji dropdown bug
Port 1467f1e1e1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:15:59 +01:00 |
|
Claire
|
6da69967d0
|
[Glitch] Change compose form to use server-provided post character limit
Port 805dba7f8d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 13:56:12 +01:00 |
|
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
|
6901930c8d
|
Add back confirmation modal for missing media description
|
2024-02-23 23:04:32 +01:00 |
|
Claire
|
9ab030bb13
|
Add thread mode button
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
e62cd93650
|
Fix composer offering to edit federation settings for an existing post
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
23dc650596
|
Restore preselect on reply option
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
3564a15553
|
Refactor composer dropdowns
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
0e77c45624
|
Add local-only option back as a federation setting dropdown
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
47deb680d5
|
Add Content-Type dropdown back
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
118bb5bc81
|
Add secondary post button back
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
61559a42a9
|
Restore glitch-soc's permalink behavior for reply indicator
|
2024-02-23 20:57:20 +01:00 |
|
Claire
|
056f9bf3c2
|
Add back “spoilers always on” feature
|
2024-02-23 20:57:18 +01:00 |
|
Claire
|
380f4fc95c
|
Reimplement sensitive checkbox
|
2024-02-22 23:49:06 +01:00 |
|
Claire
|
5fd50756b4
|
Restore glitch-soc's support of custom poll limits
|
2024-02-22 23:06:12 +01:00 |
|
Eugen Rochko
|
9c10aaa4d5
|
[Glitch] Change design of compose form in web UI
Port 6936e5aa69 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-22 23:06:12 +01:00 |
|
Claire
|
7586d4348f
|
Switch glitch-soc to upstream's old composer
|
2024-02-22 22:10:17 +01:00 |
|
Claire
|
9a11b077f7
|
Reduce CSS and markup differences with upstream (#2629)
|
2024-02-18 19:12:23 +01:00 |
|
Jeremy Kescher
|
1c9291adcd
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
|
2024-02-14 18:02:38 +01:00 |
|
Claire
|
c249c10f74
|
Fix account suggestion size inconsistency with upstream
|
2024-02-11 21:55:36 +01:00 |
|
Claire
|
f6f62002c7
|
Remove leftovers from glitch-soc's layout option
|
2024-02-08 19:21:35 +01:00 |
|
Claire
|
189b70cd6a
|
Merge SCSS in a single components.scss file
|
2024-02-08 18:50:38 +01:00 |
|
Jeremy Kescher
|
c2c2afc294
|
Merge branch 'glitch-soc' into develop
|
2024-01-28 02:29:46 +01:00 |
|
Eugen Rochko
|
72bae7e170
|
[Glitch] Fix duplicate and missing keys in search popout component in web UI
Port 9f8e3cca9a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-22 19:21:02 +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 |
|
Claire
|
52c023a305
|
Convert Permalink to Typescript
|
2024-01-14 19:22:39 +01:00 |
|
Jeremy Kescher
|
2047683539
|
v4.3.0-alpha.0+glitch+cat+1.0.8
|
2024-01-14 17:48:42 +01:00 |
|
Claire
|
e227e959f7
|
Fix glitch-soc textarea icons
|
2024-01-13 23:53:23 +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
|
5be3fb3d66
|
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
|
2024-01-02 12:16:35 +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
|
72ff0d30d8
|
Fix submitting post from content warning field not working properly (#2538)
|
2023-12-22 17:23:15 +01: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 |
|
Claire
|
a3a58c041e
|
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 8ebc94dd22
|
2023-12-20 19:48:45 +01:00 |
|
Essem
|
b7cb17fecf
|
Fix the poll option add button attempting to submit a form (#2530)
|
2023-12-20 08:24:28 +01:00 |
|
Claire
|
9bfb699c4c
|
[Glitch] Change search popout to not list unusable search options when logged out
Port 6e70819840 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-19 21:25:55 +01:00 |
|
Claire
|
3d3fa75c81
|
Reduce composer differences with upstream and simplify code (#2518)
|
2023-12-18 13:20:08 +01:00 |
|
mogaminsk
|
cc265f760e
|
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
Port ac8e4ed38d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-17 18:03:22 +01:00 |
|
Claire
|
bb4fa0c374
|
[Glitch] Rewrite AutosuggestTextarea as Functional Component
Port 9c8891b39a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-12-17 17:59:33 +01:00 |
|
Claire
|
4b2ddaf106
|
Further reduce differences with upstream
|
2023-12-09 21:19:43 +01:00 |
|