76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
2024-02-15 12:30:05 +09:00
52aeef3834
Merge remote-tracking branch 'treehouse/main' into th-downstream
2024-02-15 12:19:13 +09:00
8aae9712d9
Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"
...
This reverts commit fa3b5195fd1b1c4ff940
2024-02-15 12:16:40 +09:00
Kouhai
bb4c06aa95
th: reapply css
2024-02-14 12:25:28 -08:00
Kouhai
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
2024-02-14 09:59:05 -08:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
Ariadne Conill
c379487041
th: revert more emoji-mart twemoji 14 hacks
2024-02-10 21:02:47 -08:00
Claire
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
Claire
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +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
github-actions[bot]
a2611d782c
New Crowdin Translations (automated) ( #2588 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:45:07 +01:00
JS Moore
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:23:36 +01:00
Essem
08e511cecb
Fix doodle modal icons ( #2597 )
2024-02-06 20:22:42 +01:00
Kouhai
8fd45df06e
th: fiddle with quote style
2024-02-03 14:39:12 -08:00
Ariadne Conill
98ae4ef813
th: glitch: status: fix quote icon on quotes
2024-02-03 14:39:12 -08:00
Ariadne Conill
46d70b1ca6
th: glitch: fix quote-toot icon
2024-02-03 14:39:12 -08:00
Ariadne Conill
aa8741fff3
th: glitch: compose: remove annoying post published messages
2024-02-03 14:39:12 -08:00
472eec8ae1
I'm just trying random shit at this point
2024-02-03 16:06:55 +09:00
309dd36816
neofox_transgender
2024-02-03 14:41:20 +09:00
415c5eb2d4
Merge remote-tracking branch 'claire/glitch-soc/features/redesign-localonly-toots' into th-downstream
2024-02-03 14:28:39 +09:00
fa3b5195fd
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream
2024-02-03 14:21:55 +09:00
Ariadne Conill
2029340d6a
glitch: status: fix quote icon on quotes
2024-02-02 21:14:01 -08:00
Ariadne Conill
2a35ae9dc2
glitch: fix quote-toot icon
2024-02-02 20:59:21 -08:00
Ariadne Conill
a3cebd15da
glitch: compose: remove annoying post published messages
2024-02-02 20:29:43 -08:00
Kouhai
c1910db65f
th: live from new york it's friday night
...
various critical fixes (pls don't report this to NVD)
2024-02-01 02:37:15 -08:00
Kouhai
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
2024-02-01 00:46:44 -08:00
Kouhai
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
2024-02-01 00:33:58 -08:00
Claire
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
Claire
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
2024-01-30 22:42:22 +01:00
Claire
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
Claire
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
Eugen Rochko
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
github-actions[bot]
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 19:45:04 +01:00
Eugen Rochko
3205a654ca
Refactor conversations components in web UI ( #28833 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 14:34:26 +00:00
github-actions[bot]
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
Eugen Rochko
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
2024-01-24 20:53:15 +01:00
Claire
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
Claire
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
2024-01-24 12:37:43 +00:00
Eugen Rochko
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 10:49:19 +00:00
Eugen Rochko
01ce9df880
Fix search form re-rendering spuriously in web UI ( #28876 )
2024-01-24 07:03:30 +00:00
github-actions[bot]
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-23 10:11:37 +00:00
Eugen Rochko
72bae7e170
[Glitch] Fix duplicate and missing keys in search popout component in web UI
...
Port 9f8e3cca9a
2024-01-22 19:21:02 +01:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
renovate[bot]
1d381c1664
[Glitch] Update dependency react-redux to v9.1.0
...
Port 163db814c2
2024-01-22 19:15:02 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
github-actions[bot]
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-22 11:52:26 +00:00
Eugen Rochko
9f8e3cca9a
Fix duplicate and missing keys in search popout component in web UI ( #28834 )
2024-01-21 07:44:46 +00:00
