7fae07d5d7
local_setings: change defaults for alt text
2024-04-16 23:48:28 +00:00
df00e5e6cb
merge with catstodon/main
2024-04-16 22:39:49 +00:00
60d54db810
merge with catstodon/main
2024-02-17 05:18:13 +00:00
e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR
2024-02-16 15:12:22 +01:00
55aef6a70c
Fix scss styles being in an old state
2024-02-16 15:03:21 +01:00
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
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
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
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +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
1caf07f427
merge with catstodon/main
2024-02-02 00:14:06 +00:00
c7e37c256e
Merge branch 'glitch-soc' into develop
2024-02-01 18:18:19 +01: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
bf4d613731
Merge branch 'glitch-soc' into develop
2024-01-28 17:56:47 +01:00
Claire
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Essem
ae854b8027
Port three new emoji reaction PR commits to Catstodon:
...
"Update reaction emails
Reaction icon made by @t3rminus@calamity.world"
"Simplify reactions API controller"
"Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d
2024-01-28 02:22:43 +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
github-actions[bot]
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-19 09:41:57 +00:00
renovate[bot]
163db814c2
Update dependency react-redux to v9.1.0 ( #28717 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-19 09:41:03 +00:00
HTeuMeuLeu
86cc88c216
Fix banner image not showing in follow emails ( #28814 )
2024-01-19 09:23:59 +00:00
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
Claire
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +01:00
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
2024-01-17 22:37:29 +01:00
Santiago Kozak
036e25f19d
[Glitch] Improve display of lock icon in account headers
...
Port 30b193b856
2024-01-17 18:37:04 +01:00
Claire
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
2024-01-17 18:36:09 +01:00
