Jeremy Kescher
caccc2e0f4
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
2024-03-14 20:01:30 +01:00
Eugen Rochko
000a900d3b
[Glitch] Fix back button appearing in column header unexpectedly in web UI
...
Port 30483d618f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-14 17:43:38 +01:00
Claire
84c7b272e1
[Glitch] Fix accounts not getting imported into redux store for some filtered notification types
...
Port 95a5713ff7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-14 17:43:38 +01:00
Eugen Rochko
4b2a935c4a
[Glitch] Change design of metadata underneath posts in web UI
...
Port 4991198b70
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-14 17:43:38 +01:00
Eugen Rochko
042d17ddf1
[Glitch] Fix wrong background color on search results in web UI
...
Port 1e1d97a787
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-14 17:30:46 +01:00
mogaminsk
88f477749c
[Glitch] Use sender's username
to column title in notification request if it's display_name
is not set
...
Port 3156d04ec1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-14 17:29:38 +01:00
Claire
369e728536
Fix collapsed posts background color
2024-03-13 20:17:58 +01:00
Claire
e7b49181af
[Glitch] Hide media by default in notification requests
...
Port a32a126cac
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 20:15:23 +01:00
Renaud Chaput
663dd49a85
[Glitch] Fix navigation panel icons missing classes
...
Port acf3f410ae
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 20:13:35 +01:00
Erik Uden
e1b64151a2
[Glitch] Fix toggle button color for light (and dark/default) theme
...
Port 268856d5d9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 20:13:35 +01:00
Matt Jankowski
00d72866a3
[Glitch] Use vanilla JS to get Rails CSRF values
...
Port 00d94f3ffa
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 19:17:59 +01:00
Eugen Rochko
8c0673037a
[Glitch] Change background color in web UI
...
Port 5b60d4b696
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 19:05:05 +01:00
Renaud Chaput
435c46b316
[Glitch] Fix i18n typo
...
Port af4e44e30a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 18:58:00 +01:00
Eugen Rochko
b36e96ec90
[Glitch] Change action button to be last on profiles in web UI
...
Port 19efa1b9f1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 18:40:00 +01:00
Eugen Rochko
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 18:38:46 +01:00
Eugen Rochko
3631ddbfc9
[Glitch] Change icons in navigation panel to be filled when active in web UI
...
Port 16c856729b
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-11 18:09:07 +01:00
Renaud Chaput
6440651976
[Glitch] Use the server setting to get the max number of poll options in UI
...
Port b9722dfe2b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-11 17:38:07 +01:00
Eugen Rochko
efbc8cba17
[Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI
...
Port 2347ea813e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-11 17:36:07 +01:00
Eugen Rochko
777510a696
[Glitch] Add hints for rules
...
Port 5b3a8737d6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-11 17:34:02 +01:00
Claire
46152a19a6
Convert logo.jsx to Typescript
2024-03-08 12:46:49 +01:00
Sunny Ripert
2b4e9fbc71
[Glitch] Add form element on focal point modal
...
Port 8515bc7962
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-08 12:43:59 +01:00
Claire
98cf4b7ba0
Reduce code differences with upstream
2024-03-08 12:42:03 +01:00
neetshin
6996b96fab
[Glitch] Make columns-area unscrollable when modal opened
...
Port 2091ae92be
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-08 11:50:23 +01:00
Claire
a79bd2cd11
Make some CSS differences with upstream more explicit
2024-03-08 11:47:34 +01:00
Claire
e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional ( #2666 )
2024-03-08 11:35:18 +01:00
github-actions[bot]
d002458c7b
New Crowdin Translations (automated) ( #2661 )
...
* New Crowdin translations
* Fix bogus translations
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-07 22:39:48 +01:00
Mashiro
1fc6edfa84
[Glitch] Fix unhandled nullable attachments limitation counter
...
Port b8bd94ca8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-07 13:01:21 +01:00
Claire
3f239facff
Update flavor screenshots ( #2664 )
2024-03-07 12:59:00 +01:00
Claire
8c9341a67b
Further reduce pointless CSS differences with upstream ( #2665 )
2024-03-06 22:13:23 +01:00
GitHub Actions
1b418a3550
New Crowdin translations
2024-03-04 04:57:12 +00:00
Jeremy Kescher
6aa17a7c1b
Merge branch 'glitch-soc' into develop
2024-03-03 03:12:37 +01:00
Jeremy Kescher
05747febb6
Merge branch 'glitch-soc' into develop
2024-02-29 19:32:12 +01:00
Claire
f6654e0842
Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
This file was split between `app/javascript/core/admin.js`,
`app/javascript/pack/admin.jsx`, and
`app/javascript/flavours/glitch/packs/admin.jsx`.
Ported upstream's change, splitting the new file to
`app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
and `app/javascript/flavours/glitch/packs/admin.tsx`
2024-02-29 19:02:31 +01:00
Claire
a04b384482
[Glitch] Fix regression with search bar icon position
...
Port edd6aa70e1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-29 18:30:24 +01:00
Claire
bbfcd71118
[Glitch] Fix preview card player getting embedded when clicking on the external link button
...
Port f24c62a5c8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-29 18:29:57 +01:00
Renaud Chaput
5b97fdf84c
[Glitch] Fix full date display not respecting the locale 12/24h format
...
Port 4185f3792c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-29 18:29:11 +01:00
Claire
8dbdd7571f
Merge pull request #2655 from TheEssem/fix/open-in
...
Use upstream's openURL function for search
2024-02-29 18:23:56 +01:00
Essem
9242c536d2
Use openURL function from upstream
2024-02-28 23:41:18 -06:00
GitHub Actions
ab195bcee1
New Crowdin translations
2024-02-29 04:27:18 +00:00
Jeremy Kescher
de1e89f42c
Merge branch 'glitch-soc' into develop
2024-02-28 23:01:31 +01:00
Jeong Arm
4004801ee8
[Glitch] Show comments in the admin/instances page
...
Port deffb8ecb6
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 20:38:17 +01:00
Roni Laukkarinen
c844817c78
[Glitch] Fix the regression with the search icon position
...
Port edfc53856f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 20:37:48 +01:00
renovate[bot]
9324fbe984
[Glitch] Update devDependencies (non-major)
...
Port dc4427dc9b
to glitch-soc
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 20:30:58 +01:00
Renaud Chaput
0ff9800989
[Glitch] Use modern ES syntax rather than .call
...
Port 899eac1a92
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 20:11:26 +01:00
Claire
c2f0ea415e
Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
2024-02-28 20:10:01 +01:00
Claire
c19787f3f4
Add doodle feature back ( #2652 )
2024-02-27 21:27:51 +01:00
Claire
e8155319c7
Take advantage of upstream's refactor and reduce code duplication
2024-02-27 19:28:13 +01:00
Claire
916d78373d
[Glitch] Change behavior of privacy dropdown to only change value on validation
...
Port 90573c3abb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-27 19:24:34 +01:00
Evan Paterakis
1b219e709b
[Glitch] Fix filters title and keywords overflow
...
Port 213c87ae59
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-27 19:24:03 +01:00
Matt Jankowski
8a80ad7fc4
[Glitch] Remove unused media-spoiler-*
JS/CSS
...
Port c7555271a6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
20bc633b0c
[Glitch] Change new explore compass icon CSS class to explore
...
Port 10fdd88288
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
3fc4859279
[Glitch] Fix search icon position on mobile
...
Port 1cb74eeec0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
658911c268
[Glitch] Improve alt text form accessibility with long texts
...
Port bbf6cb66f6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-26 17:54:58 +01:00
Eugen Rochko
f6903d9ab0
[Glitch] Change explore icon from hashtag to compass in web UI
...
Port b8b2f20b16
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-26 17:54:58 +01:00
Essem
fa2bbbfd9d
Fix "threaded more" typo
2024-02-25 17:10:25 -06:00
Essem
4edbebfbac
Fix reaction picker dropdown appearance
2024-02-25 18:16:15 +01:00
Essem
0ea10045f1
Merge fixes
2024-02-25 18:14:49 +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
4c24022984
Fix min_options, let vanilla flavor behave properly for pollLimits
2024-02-24 18:25:47 +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
Hinaloe
ba67ea3d12
[Glitch] Fix sensitive
flag not being removed when removing CW in new compose form
...
Port c645490d55
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:53:49 +01:00
Eugen Rochko
200e11ae88
[Glitch] Change follow suggestions design in web UI
...
Port 63f4ea055a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:53:09 +01:00
Claire
26924a0c7d
[Glitch] Change source
attribute of Suggestion
entity in /api/v2/suggestions
back to a string
...
Port 7ee93b7431
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:52:44 +01:00
Nicolas Hoffmann
e45f40d203
[Glitch] Fix modal container bounds
...
Port 476a043fc5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:49:35 +01:00
Claire
9f0ff2bedf
[Glitch] Clean up some unused CSS definitions
...
Port 67ec192d7d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:49:03 +01:00
Claire
3c36e1be68
[Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category
...
Port 9ce914cc89
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:36:55 +01:00
y.takahashi
3894674200
[Glitch] Fix 'focus the compose textarea' shortcut is not working
...
Port 3c315a68af
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:35:52 +01:00
Eugen Rochko
cce3f3d6da
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
...
Port 9cdc60ecc6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-24 14:35:08 +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
c3adcec8fb
Fix profile fields styling in Oatstodon flavor
2024-02-24 11:41:15 +01:00
Jeremy Kescher
a4e12a484d
Merge branch 'glitch-soc' into develop
2024-02-24 11:11:24 +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
138286147f
Fix emoji being inserted in incorrect places
2024-02-23 21:45:48 +01:00
Claire
6eede9d84b
Add notification badge feature back
2024-02-23 21:05:34 +01:00
Claire
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +01:00
Claire
e333453343
Use Warning icon for CWs in app settings
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
84d05ca221
Reimplement glitchy elephant friend
2024-02-23 21:05:33 +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
179437ed0e
Restore access to glitch-soc app settings
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
fff378177e
Further reduce differences with upstream (mainly private mention styling) ( #2641 )
...
* Use upstream's CSS for private mentions styling
* Further reduce differences with upstream
2024-02-22 18:45:54 +01:00
Claire
604c93332f
Fix pillbar button colors ( #2639 )
2024-02-21 19:30:54 +01:00
Claire
154a3119fb
Further reduce CSS differences with upstream ( #2638 )
2024-02-21 17:50:41 +01:00
Claire
bf6e57b420
Further reduce CSS and markup differences with upstream ( #2637 )
...
* Reduce differences in `MovedNote` markup and styling
* Remove unused setting toggle meta text support
* Fix various CSS discrepancies with upstream
* Further reduce differences with upstream
2024-02-20 23:06:17 +01:00
Claire
5f50b634cf
Further reduce CSS and markup differences with upstream ( #2635 )
...
* Further reduce CSS differences with upstream
* Reduce differences in markup and CSS with upstream
* Redo collapsible post notifications
* Reduce CSS differences further
* Reduce differences with upstream regarding `.status` and `.status__wrapper`
* Further reduce differences with upstream
* Reduce differences with upstream in DisplayName
2024-02-20 18:49:59 +01:00
Claire
0a2b95c4f5
Adopt upstream's design for preview cards ( #2634 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
2024-02-19 22:47:01 +01:00
Claire
89ea492d70
Further reduce CSS changes with upstream ( #2632 )
2024-02-19 19:54:51 +01:00
Claire
bbecf1c56b
Further reduce differences with upstream ( #2631 )
...
* Further reduce CSS diffs with upstream
* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
2024-02-18 22:30:20 +01:00
Claire
034be5ad50
Further reduce CSS differences with upstream ( #2630 )
2024-02-18 20:45:36 +01:00
Claire
9a11b077f7
Reduce CSS and markup differences with upstream ( #2629 )
2024-02-18 19:12:23 +01:00
Danko Aleksejevs
e078ede097
Remove status content from mobile actions modal ( #2615 )
2024-02-18 19:10:58 +01:00
Claire
8a10feb8dc
[Glitch] Fix Web UI not displaying appropriate explanation when a user hides their follows/followers
...
Port 9b06c0f24a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-17 20:15:25 +01:00
Jeremy Kescher
e60d3df9bb
Merge branch 'glitch-soc' into develop
2024-02-17 18:53:31 +01:00
Claire
d86b642dc6
Fix dead and misapplied CSS ( #2627 )
2024-02-17 18:52:59 +01:00
Claire
41c85e3b6d
Change list title input design to fit upstream ( #2626 )
...
* Change settings input field design to match upstream's
* Fix light theme discrepancies
* Restore regexp inputs as glitch-soc-specific styles
2024-02-17 18:52:37 +01:00
Jeremy Kescher
05a5c20681
Merge branch 'glitch-soc' into develop
2024-02-17 18:16:14 +01:00
Claire
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-16 18:18:17 +01:00
Eugen Rochko
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-16 18:17:55 +01:00
Claire
c0279385d7
Adopt upstream's design for account profiles ( #2622 )
...
* Mostly adopt upstream's design for account profiles
* Reduce some margins
2024-02-16 17:57:43 +01:00
Jeremy Kescher
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
Jeremy Kescher
55aef6a70c
Fix scss styles being in an old state
2024-02-16 15:03:21 +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
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
Jeremy Kescher
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
Jeremy Kescher
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
Jeremy Kescher
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-01-28 14:53:08 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Claire
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 20:51:08 +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
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 20:53:15 +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
renovate[bot]
1d381c1664
[Glitch] Update dependency react-redux to v9.1.0
...
Port 163db814c2
to glitch-soc
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-22 19:15:02 +01:00
Jeremy Kescher
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
Jeremy Kescher
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:37:04 +01:00
Claire
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:36:09 +01:00
Claire
e8294925e6
[Glitch] Fix various icon alignment issues
...
Port baab58c80b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:34:57 +01:00
renovate[bot]
d56e9fb873
[Glitch] Update devDependencies (non-major)
...
Port 4e277f83dc
to glitch-soc
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:12:00 +01:00
Jeong Arm
411efdc2d3
Fix getting started misc column on dev env ( #2575 )
...
* Fix getting started misc column on dev
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-16 17:40:03 +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
6e4d5b4736
Fix some icon-related styling issues
2024-01-15 21:05:54 +01:00