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
github-actions[bot]
7f84bbfd92
New Crowdin Translations (automated) ( #29430 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-28 12:14:42 +00:00
Jeong Arm
deffb8ecb6
Show comments in the admin/instances page ( #29240 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 12:07:06 +00:00
Roni Laukkarinen
edfc53856f
Fix the regression with the search icon position ( #29417 )
2024-02-28 12:01:18 +00: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
2024-02-27 19:24:34 +01:00
Evan Paterakis
1b219e709b
[Glitch] Fix filters title and keywords overflow
...
Port 213c87ae59
2024-02-27 19:24:03 +01:00
Claire
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
renovate[bot]
dc4427dc9b
Update devDependencies (non-major) ( #29089 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-02-27 16:07:43 +00:00
Renaud Chaput
899eac1a92
Use modern ES syntax rather than .call ( #29368 )
2024-02-27 15:42:05 +00:00
github-actions[bot]
bc4c5ed918
New Crowdin Translations (automated) ( #29423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-27 14:53:53 +00:00
Claire
90573c3abb
Change behavior of privacy dropdown to only change value on validation ( #29406 )
2024-02-27 11:41:19 +00:00
Evan Paterakis
213c87ae59
Fix filters title and keywords overflow ( #29396 )
2024-02-27 10:46:58 +00:00
Matt Jankowski
8a80ad7fc4
[Glitch] Remove unused media-spoiler-* JS/CSS
...
Port c7555271a6
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
20bc633b0c
[Glitch] Change new explore compass icon CSS class to explore
...
Port 10fdd88288
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
3fc4859279
[Glitch] Fix search icon position on mobile
...
Port 1cb74eeec0
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
658911c268
[Glitch] Improve alt text form accessibility with long texts
...
Port bbf6cb66f6
2024-02-26 17:54:58 +01:00
Eugen Rochko
f6903d9ab0
[Glitch] Change explore icon from hashtag to compass in web UI
...
Port b8b2f20b16
2024-02-26 17:54:58 +01:00
Claire
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
Matt Jankowski
c7555271a6
Remove unused media-spoiler-* JS/CSS ( #29407 )
2024-02-26 15:30:58 +00:00
Roni Laukkarinen
10fdd88288
Change new explore compass icon CSS class to explore ( #29395 )
2024-02-26 15:28:38 +00:00
github-actions[bot]
98e3dc2578
New Crowdin Translations (automated) ( #29382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-26 13:03:06 +00:00
Roni Laukkarinen
1cb74eeec0
Fix search icon position on mobile ( #29384 )
2024-02-26 00:57:48 +00:00
Roni Laukkarinen
bbf6cb66f6
Improve alt text form accessibility with long texts ( #27095 )
2024-02-26 00:57:13 +00:00
Essem
fa2bbbfd9d
Fix "threaded more" typo
2024-02-25 17:10:25 -06:00
Claire
3ffb81e04f
[Glitch] Add end-to-end test for OCR in media uploads
...
Port ca8fbda5d0
2024-02-24 16:13:13 +01:00
Claire
ad0be125f5
[Glitch] Fix pixel alignment for some composer icons
...
Port 25ffe0af45
2024-02-24 15:53:42 +01:00
Claire
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
Claire
1ad91dece8
Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes applied to `app/javascript/core/admin.js` instead.
2024-02-24 15:35:56 +01:00
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Hinaloe
ba67ea3d12
[Glitch] Fix sensitive flag not being removed when removing CW in new compose form
...
Port c645490d55
2024-02-24 14:53:49 +01:00
Eugen Rochko
200e11ae88
[Glitch] Change follow suggestions design in web UI
...
Port 63f4ea055a
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
2024-02-24 14:52:44 +01:00
Nicolas Hoffmann
e45f40d203
[Glitch] Fix modal container bounds
...
Port 476a043fc5
2024-02-24 14:49:35 +01:00
Claire
9f0ff2bedf
[Glitch] Clean up some unused CSS definitions
...
Port 67ec192d7d
2024-02-24 14:49:03 +01:00
Claire
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
Claire
3c36e1be68
[Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category
...
Port 9ce914cc89
2024-02-24 14:36:55 +01:00
y.takahashi
3894674200
[Glitch] Fix 'focus the compose textarea' shortcut is not working
...
Port 3c315a68af
2024-02-24 14:35:52 +01:00
Eugen Rochko
cce3f3d6da
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
...
Port 9cdc60ecc6
2024-02-24 14:35:08 +01:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Yamagishi Kazutoshi
b4cca47f5f
[Glitch] Remove unused l18n messages
...
Port b3075a9993
2024-02-24 14:19:26 +01:00
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
J H
4d6844eb2f
[Glitch] Fixed the toggle emoji dropdown bug
...
Port 1467f1e1e1
2024-02-24 14:15:59 +01:00
Claire
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
Claire
6da69967d0
[Glitch] Change compose form to use server-provided post character limit
...
Port 805dba7f8d
2024-02-24 13:56:12 +01:00
Claire
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +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
25ffe0af45
Fix pixel alignment for some composer icons ( #29372 )
2024-02-23 15:32:13 +00:00
github-actions[bot]
bba4118ddd
New Crowdin Translations (automated) ( #29369 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-23 15:21:02 +00: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
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
10a0d76bf0
Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different handling for
the character limit.
Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different limits for
option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
Change how the new image is looked up.
2024-02-22 20:58:41 +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
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00: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
github-actions[bot]
fd2b6c29c6
New Crowdin Translations (automated) ( #29311 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-21 11:24:44 +00: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
github-actions[bot]
9a2b9d1484
New Crowdin Translations (automated) ( #29298 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-20 09:23:40 +00:00
Claire
bde4df6be6
Remove CSS definitions for some unused classes ( #29279 )
2024-02-20 09:18:44 +00:00
Eugen Rochko
b8b2f20b16
Change explore icon from hashtag to compass in web UI ( #29294 )
2024-02-20 09:10:44 +00: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
Hinaloe
c645490d55
Fix sensitive flag not being removed when removing CW in new compose form ( #29248 )
2024-02-19 13:31:16 +00:00
github-actions[bot]
ad16362efe
New Crowdin Translations (automated) ( #29255 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-19 13:25:45 +00:00
Eugen Rochko
63f4ea055a
Change follow suggestions design in web UI ( #29272 )
2024-02-19 11:09:58 +00: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
2024-02-17 20:15:25 +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
Claire
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
2024-02-16 18:18:17 +01:00
Eugen Rochko
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
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
github-actions[bot]
1c93d625c6
New Crowdin Translations (automated) ( #29195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-16 07:51:13 +00:00
Nicolas Hoffmann
476a043fc5
Fix modal container bounds ( #29185 )
2024-02-13 12:58:21 +00:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
github-actions[bot]
5de1ce23c3
New Crowdin Translations (automated) ( #29182 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-13 09:08:55 +00:00
github-actions[bot]
6482948547
New Crowdin Translations (automated) ( #29156 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-12 09:59:05 +00:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
