e7b49181af
[Glitch] Hide media by default in notification requests
...
Port a32a126cac
2024-03-13 20:15:23 +01:00
65ca37bbaa
Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
2024-03-13 20:14:18 +01:00
663dd49a85
[Glitch] Fix navigation panel icons missing classes
...
Port acf3f410ae
2024-03-13 20:13:35 +01:00
e1b64151a2
[Glitch] Fix toggle button color for light (and dark/default) theme
...
Port 268856d5d9
2024-03-13 20:13:35 +01:00
48134bcd10
Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream
2024-03-13 20:13:29 +01:00
00d72866a3
[Glitch] Use vanilla JS to get Rails CSRF values
...
Port 00d94f3ffa
2024-03-13 19:17:59 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
8c0673037a
[Glitch] Change background color in web UI
...
Port 5b60d4b696
2024-03-13 19:05:05 +01:00
c6dbb33944
Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream
2024-03-13 18:58:47 +01:00
435c46b316
[Glitch] Fix i18n typo
...
Port af4e44e30a
2024-03-13 18:58:00 +01:00
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
b36e96ec90
[Glitch] Change action button to be last on profiles in web UI
...
Port 19efa1b9f1
2024-03-13 18:40:00 +01:00
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
2024-03-13 18:38:46 +01:00
a32a126cac
Hide media by default in notification requests ( #29572 )
2024-03-13 16:47:48 +00:00
acf3f410ae
Fix navigation panel icons missing classes ( #29569 )
2024-03-13 12:54:50 +00:00
171948b910
New Crowdin Translations (automated) ( #29563 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-13 12:42:44 +00:00
268856d5d9
Fix toggle button color for light (and dark/default) theme ( #29553 )
2024-03-13 11:45:20 +00:00
00d94f3ffa
Use vanilla JS to get Rails CSRF values ( #29403 )
2024-03-12 17:10:37 +00:00
5b60d4b696
Change background color in web UI ( #29522 )
2024-03-12 09:51:30 +00:00
af4e44e30a
Fix i18n typo ( #29557 )
2024-03-12 09:42:51 +00:00
dc36b961aa
New Crowdin Translations (automated) ( #29554 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-12 09:03:51 +00:00
3631ddbfc9
[Glitch] Change icons in navigation panel to be filled when active in web UI
...
Port 16c856729b
2024-03-11 18:09:07 +01:00
6440651976
[Glitch] Use the server setting to get the max number of poll options in UI
...
Port b9722dfe2b
2024-03-11 17:38:07 +01:00
efbc8cba17
[Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI
...
Port 2347ea813e
2024-03-11 17:36:07 +01:00
777510a696
[Glitch] Add hints for rules
...
Port 5b3a8737d6
2024-03-11 17:34:02 +01:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
19efa1b9f1
Change action button to be last on profiles in web UI ( #29533 )
2024-03-11 14:33:48 +00:00
16c856729b
Change icons in navigation panel to be filled when active in web UI ( #29537 )
2024-03-11 13:35:23 +00:00
b9722dfe2b
Use the server setting to get the max number of poll options in UI ( #29490 )
2024-03-11 09:13:35 +00:00
2347ea813e
Change dropdown menu icon to not be replaced by close icon when open in web UI ( #29532 )
2024-03-11 08:57:23 +00:00
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
f85168b189
New Crowdin Translations (automated) ( #29467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-11 07:37:04 +00:00
46152a19a6
Convert logo.jsx to Typescript
2024-03-08 12:46:49 +01:00
2b4e9fbc71
[Glitch] Add form element on focal point modal
...
Port 8515bc7962
2024-03-08 12:43:59 +01:00
98cf4b7ba0
Reduce code differences with upstream
2024-03-08 12:42:03 +01:00
6996b96fab
[Glitch] Make columns-area unscrollable when modal opened
...
Port 2091ae92be
2024-03-08 11:50:23 +01:00
a79bd2cd11
Make some CSS differences with upstream more explicit
2024-03-08 11:47:34 +01:00
e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional ( #2666 )
2024-03-08 11:35:18 +01:00
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
1fc6edfa84
[Glitch] Fix unhandled nullable attachments limitation counter
...
Port b8bd94ca8e
2024-03-07 13:01:21 +01:00
442a5cb66c
Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream
2024-03-07 12:59:51 +01:00
3f239facff
Update flavor screenshots ( #2664 )
2024-03-07 12:59:00 +01:00
8c9341a67b
Further reduce pointless CSS differences with upstream ( #2665 )
2024-03-06 22:13:23 +01:00
b8bd94ca8e
Fix unhandled nullable attachments limitation counter ( #29183 )
2024-03-06 12:53:54 +00:00
1b418a3550
New Crowdin translations
2024-03-04 04:57:12 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
1d721b21e1
Add attribution to Tabler.io icons used in the new mailer designs ( #29470 )
2024-03-01 14:51:01 +00:00
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
f01605c665
Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.tsx`:
Changes applied to `app/javascript/core/admin.ts` instead.
2024-03-01 13:02:59 +01:00
ec953bf378
Fix regression in handling `select` elements in `packs/admin.tsx` ( #29469 )
2024-03-01 10:16:35 +00:00
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
a04b384482
[Glitch] Fix regression with search bar icon position
...
Port edd6aa70e1
2024-02-29 18:30:24 +01:00
bbfcd71118
[Glitch] Fix preview card player getting embedded when clicking on the external link button
...
Port f24c62a5c8
2024-02-29 18:29:57 +01:00
5b97fdf84c
[Glitch] Fix full date display not respecting the locale 12/24h format
...
Port 4185f3792c
2024-02-29 18:29:11 +01:00
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
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
958a810553
Convert `packs/admin.jsx` to Typescript ( #29425 )
2024-02-29 15:21:03 +00:00
edd6aa70e1
Fix regression with search bar icon position ( #29456 )
2024-02-29 13:54:06 +00:00
f24c62a5c8
Fix preview card player getting embedded when clicking on the external link button ( #29457 )
2024-02-29 13:54:02 +00:00
4185f3792c
Fix full date display not respecting the locale 12/24h format ( #29448 )
2024-02-29 09:40:13 +00:00
cdf5098166
New Crowdin Translations (automated) ( #29452 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-29 09:38:33 +00:00
9242c536d2
Use openURL function from upstream
2024-02-28 23:41:18 -06:00
ab195bcee1
New Crowdin translations
2024-02-29 04:27:18 +00:00
4004801ee8
[Glitch] Show comments in the admin/instances page
...
Port deffb8ecb6
2024-02-28 20:38:17 +01:00
c844817c78
[Glitch] Fix the regression with the search icon position
...
Port edfc53856f
2024-02-28 20:37:48 +01:00
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
9324fbe984
[Glitch] Update devDependencies (non-major)
...
Port dc4427dc9b
2024-02-28 20:30:58 +01:00
21e7a53ca5
Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
were changed, but otherwise no real conflict.
Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
Upstream's dependencies changed the code style rules for json formatting, and
we had local changes.
Kept our changes, but with upstream's formatting/
- `yarn.lock`:
A dependency textually adjacent to a glitch-soc-only one got changed.
Applied upstream's change, keeping the glitch-soc-only dependency.
2024-02-28 20:27:28 +01:00
0ff9800989
[Glitch] Use modern ES syntax rather than `.call`
...
Port 899eac1a92
2024-02-28 20:11:26 +01:00
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
7f84bbfd92
New Crowdin Translations (automated) ( #29430 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-28 12:14:42 +00:00
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
edfc53856f
Fix the regression with the search icon position ( #29417 )
2024-02-28 12:01:18 +00:00
c19787f3f4
Add doodle feature back ( #2652 )
2024-02-27 21:27:51 +01:00
e8155319c7
Take advantage of upstream's refactor and reduce code duplication
2024-02-27 19:28:13 +01:00
916d78373d
[Glitch] Change behavior of privacy dropdown to only change value on validation
...
Port 90573c3abb
2024-02-27 19:24:34 +01:00
1b219e709b
[Glitch] Fix filters title and keywords overflow
...
Port 213c87ae59
2024-02-27 19:24:03 +01:00
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
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
899eac1a92
Use modern ES syntax rather than `.call` ( #29368 )
2024-02-27 15:42:05 +00:00
bc4c5ed918
New Crowdin Translations (automated) ( #29423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-27 14:53:53 +00:00
90573c3abb
Change behavior of privacy dropdown to only change value on validation ( #29406 )
2024-02-27 11:41:19 +00:00
213c87ae59
Fix filters title and keywords overflow ( #29396 )
2024-02-27 10:46:58 +00:00
8a80ad7fc4
[Glitch] Remove unused `media-spoiler-*` JS/CSS
...
Port c7555271a6
2024-02-26 17:54:58 +01:00
20bc633b0c
[Glitch] Change new explore compass icon CSS class to explore
...
Port 10fdd88288
2024-02-26 17:54:58 +01:00
3fc4859279
[Glitch] Fix search icon position on mobile
...
Port 1cb74eeec0
2024-02-26 17:54:58 +01:00
658911c268
[Glitch] Improve alt text form accessibility with long texts
...
Port bbf6cb66f6
2024-02-26 17:54:58 +01:00
f6903d9ab0
[Glitch] Change explore icon from hashtag to compass in web UI
...
Port b8b2f20b16
2024-02-26 17:54:58 +01:00
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
c7555271a6
Remove unused `media-spoiler-*` JS/CSS ( #29407 )
2024-02-26 15:30:58 +00:00
10fdd88288
Change new explore compass icon CSS class to explore ( #29395 )
2024-02-26 15:28:38 +00:00
98e3dc2578
New Crowdin Translations (automated) ( #29382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-26 13:03:06 +00:00
1cb74eeec0
Fix search icon position on mobile ( #29384 )
2024-02-26 00:57:48 +00:00
bbf6cb66f6
Improve alt text form accessibility with long texts ( #27095 )
2024-02-26 00:57:13 +00:00
fa2bbbfd9d
Fix "threaded more" typo
2024-02-25 17:10:25 -06:00
3ffb81e04f
[Glitch] Add end-to-end test for OCR in media uploads
...
Port ca8fbda5d0
2024-02-24 16:13:13 +01:00
ad0be125f5
[Glitch] Fix pixel alignment for some composer icons
...
Port 25ffe0af45
2024-02-24 15:53:42 +01:00
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
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
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
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
200e11ae88
[Glitch] Change follow suggestions design in web UI
...
Port 63f4ea055a
2024-02-24 14:53:09 +01:00
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
e45f40d203
[Glitch] Fix modal container bounds
...
Port 476a043fc5
2024-02-24 14:49:35 +01:00
9f0ff2bedf
[Glitch] Clean up some unused CSS definitions
...
Port 67ec192d7d
2024-02-24 14:49:03 +01:00
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
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
3894674200
[Glitch] Fix 'focus the compose textarea' shortcut is not working
...
Port 3c315a68af
2024-02-24 14:35:52 +01:00
cce3f3d6da
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
...
Port 9cdc60ecc6
2024-02-24 14:35:08 +01:00
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
b4cca47f5f
[Glitch] Remove unused l18n messages
...
Port b3075a9993
2024-02-24 14:19:26 +01:00
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
4d6844eb2f
[Glitch] Fixed the toggle emoji dropdown bug
...
Port 1467f1e1e1
2024-02-24 14:15:59 +01:00
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
6da69967d0
[Glitch] Change compose form to use server-provided post character limit
...
Port 805dba7f8d
2024-02-24 13:56:12 +01:00
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
6901930c8d
Add back confirmation modal for missing media description
2024-02-23 23:04:32 +01:00
138286147f
Fix emoji being inserted in incorrect places
2024-02-23 21:45:48 +01:00
6eede9d84b
Add notification badge feature back
2024-02-23 21:05:34 +01:00
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +01:00
e333453343
Use Warning icon for CWs in app settings
2024-02-23 21:05:34 +01:00
e62cd93650
Fix composer offering to edit federation settings for an existing post
2024-02-23 21:05:34 +01:00
23dc650596
Restore preselect on reply option
2024-02-23 21:05:34 +01:00
84d05ca221
Reimplement glitchy elephant friend
2024-02-23 21:05:33 +01:00
3564a15553
Refactor composer dropdowns
2024-02-23 21:05:33 +01:00
0e77c45624
Add local-only option back as a federation setting dropdown
2024-02-23 21:05:33 +01:00
47deb680d5
Add Content-Type dropdown back
2024-02-23 21:05:33 +01:00
118bb5bc81
Add secondary post button back
2024-02-23 21:05:33 +01:00
61559a42a9
Restore glitch-soc's permalink behavior for reply indicator
2024-02-23 20:57:20 +01:00
179437ed0e
Restore access to glitch-soc app settings
2024-02-23 20:57:20 +01:00
056f9bf3c2
Add back “spoilers always on” feature
2024-02-23 20:57:18 +01:00
25ffe0af45
Fix pixel alignment for some composer icons ( #29372 )
2024-02-23 15:32:13 +00:00
bba4118ddd
New Crowdin Translations (automated) ( #29369 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-23 15:21:02 +00:00
380f4fc95c
Reimplement sensitive checkbox
2024-02-22 23:49:06 +01:00
5fd50756b4
Restore glitch-soc's support of custom poll limits
2024-02-22 23:06:12 +01:00
9c10aaa4d5
[Glitch] Change design of compose form in web UI
...
Port 6936e5aa69
2024-02-22 23:06:12 +01:00
7586d4348f
Switch glitch-soc to upstream's old composer
2024-02-22 22:10:17 +01:00
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
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
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00:00
604c93332f
Fix pillbar button colors ( #2639 )
2024-02-21 19:30:54 +01:00
154a3119fb
Further reduce CSS differences with upstream ( #2638 )
2024-02-21 17:50:41 +01:00
fd2b6c29c6
New Crowdin Translations (automated) ( #29311 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-21 11:24:44 +00:00
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
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
9a2b9d1484
New Crowdin Translations (automated) ( #29298 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-20 09:23:40 +00:00
bde4df6be6
Remove CSS definitions for some unused classes ( #29279 )
2024-02-20 09:18:44 +00:00
b8b2f20b16
Change explore icon from hashtag to compass in web UI ( #29294 )
2024-02-20 09:10:44 +00:00
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
89ea492d70
Further reduce CSS changes with upstream ( #2632 )
2024-02-19 19:54:51 +01:00
c645490d55
Fix `sensitive` flag not being removed when removing CW in new compose form ( #29248 )
2024-02-19 13:31:16 +00:00
ad16362efe
New Crowdin Translations (automated) ( #29255 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-19 13:25:45 +00:00
63f4ea055a
Change follow suggestions design in web UI ( #29272 )
2024-02-19 11:09:58 +00:00
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
034be5ad50
Further reduce CSS differences with upstream ( #2630 )
2024-02-18 20:45:36 +01:00
9a11b077f7
Reduce CSS and markup differences with upstream ( #2629 )
2024-02-18 19:12:23 +01:00
e078ede097
Remove status content from mobile actions modal ( #2615 )
2024-02-18 19:10:58 +01:00
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
d86b642dc6
Fix dead and misapplied CSS ( #2627 )
2024-02-17 18:52:59 +01:00
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
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
2024-02-16 18:18:17 +01:00
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
2024-02-16 18:17:55 +01:00
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
1c93d625c6
New Crowdin Translations (automated) ( #29195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-16 07:51:13 +00:00
476a043fc5
Fix modal container bounds ( #29185 )
2024-02-13 12:58:21 +00:00
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
5de1ce23c3
New Crowdin Translations (automated) ( #29182 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-13 09:08:55 +00:00
6482948547
New Crowdin Translations (automated) ( #29156 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-12 09:59:05 +00:00
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
c07028b2fa
New Crowdin Translations (automated) ( #29152 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-09 09:55:30 +00:00
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
ca8fbda5d0
Add end-to-end test for OCR in media uploads ( #29148 )
2024-02-08 19:13:44 +00:00
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
189b70cd6a
Merge SCSS in a single `components.scss` file
2024-02-08 18:50:38 +01:00
67ec192d7d
Clean up some unused CSS definitions ( #29146 )
2024-02-08 11:40:22 +00:00
2a362d62a8
New Crowdin Translations (automated) ( #29145 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-08 09:43:02 +00:00
17052714a2
New Crowdin Translations (automated) ( #29121 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-07 12:38:37 +00:00
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
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
08e511cecb
Fix doodle modal icons ( #2597 )
2024-02-06 20:22:42 +01:00
90ccf7beb2
New Crowdin Translations (automated) ( #28965 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-06 18:47:44 +00:00
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
9ce914cc89
Fix report reason selector in moderation interface not unselecting rules when changing category ( #29026 )
2024-02-06 09:35:36 +00:00
3c315a68af
Fix 'focus the compose textarea' shortcut is not working ( #29059 )
2024-02-02 06:33:53 +00:00
9cdc60ecc6
Change onboarding prompt to follow suggestions carousel in web UI ( #28878 )
2024-02-01 13:37:04 +00:00
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
2024-01-30 22:42:22 +01:00
b3075a9993
Remove unused l18n messages ( #28964 )
2024-01-30 15:34:07 +00:00
1467f1e1e1
Fixed the toggle emoji dropdown bug ( #29012 )
2024-01-30 13:38:49 +00:00
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
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
805dba7f8d
Change compose form to use server-provided post character limit ( #28928 )
2024-01-26 14:09:45 +00:00
45287049ab
New Crowdin Translations (automated) ( #28923 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-26 09:15:55 +00:00
6936e5aa69
Change design of compose form in web UI ( #28119 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 15:41:31 +00:00
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
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
2024-01-24 20:53:15 +01:00
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
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
2024-01-24 12:37:43 +00:00
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
01ce9df880
Fix search form re-rendering spuriously in web UI ( #28876 )
2024-01-24 07:03:30 +00:00
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-23 10:11:37 +00:00
72bae7e170
[Glitch] Fix duplicate and missing keys in search popout component in web UI
...
Port 9f8e3cca9a
2024-01-22 19:21:02 +01:00
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
1d381c1664
[Glitch] Update dependency react-redux to v9.1.0
...
Port 163db814c2
2024-01-22 19:15:02 +01:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-22 11:52:26 +00:00
9f8e3cca9a
Fix duplicate and missing keys in search popout component in web UI ( #28834 )
2024-01-21 07:44:46 +00:00
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-19 09:41:57 +00:00
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
86cc88c216
Fix banner image not showing in follow emails ( #28814 )
2024-01-19 09:23:59 +00:00
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +01:00
036e25f19d
[Glitch] Improve display of lock icon in account headers
...
Port 30b193b856
2024-01-17 18:37:04 +01:00
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
2024-01-17 18:36:09 +01:00
e8294925e6
[Glitch] Fix various icon alignment issues
...
Port baab58c80b
2024-01-17 18:34:57 +01:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
d56e9fb873
[Glitch] Update devDependencies (non-major)
...
Port 4e277f83dc
2024-01-17 18:12:00 +01:00
8485bedddc
Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream
2024-01-17 18:09:15 +01:00
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +00:00
e817fe4c35
Change media “ALT” label to a specific class ( #28777 )
2024-01-17 15:32:56 +00:00
1a3859d8e2
Update follow and follow_request emails ( #28755 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 14:37:04 +00:00
1ab42ad12b
New Crowdin Translations (automated) ( #28749 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-17 14:23:14 +00:00
baab58c80b
Fix various icon alignment issues ( #28775 )
2024-01-17 10:42:47 +00:00
4e277f83dc
Update devDependencies (non-major) ( #28728 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-16 18:34:22 +00:00
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
5b67389bba
[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible
...
Port 01b6c83c36
2024-01-16 12:21:13 +01:00
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
2024-01-16 12:04:11 +01:00
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
2024-01-16 10:27:26 +00:00
01df34b9db
Remove bypass and use use glitch-soc's theming system for inert.css
2024-01-15 22:16:26 +01:00
34c9f77b3e
Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Conflict caused by glitch-soc's theming system.
Used glitch-soc's path for the mailer pack.
2024-01-15 21:30:00 +01:00
6e4d5b4736
Fix some icon-related styling issues
2024-01-15 21:05:54 +01:00
a1920425ca
[Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons
...
Port 6bbcd9348e
2024-01-15 20:53:08 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
8cad0a4d6b
[Glitch] Change icon SVG imports to use a default import
...
Port 608f66f978
2024-01-15 20:20:38 +01:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
60298af3c4
Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how the `inert.css` file is included.
The conflict is caused by glitch-soc's theming system.
Ported the upstream change.
Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
system for `inert` pack.
2024-01-15 20:01:36 +01:00
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-01-15 18:18:59 +00:00
82d28ac956
Merge pull request #2567 from ClearlyClaire/glitch-soc/ports/convert-utils-hashtags-typescript
...
Convert utils and hashtags to Typescript
2024-01-15 12:41:22 +01:00
50188ad211
[Glitch] Use helpers to check environment in frontend ( #2571 )
...
Port 277e6968f5
2024-01-15 12:16:05 +01:00
1012ffac9e
New Crowdin Translations (automated) ( #28721 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-15 11:06:25 +00:00
f8941c41a5
[Glitch] Converted hashtag.jsx to TypeScript
...
Port 3a7f10c3f1
2024-01-14 19:22:39 +01:00
695dcc6ca8
[Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
...
Port 1142f4c79e
2024-01-14 19:22:39 +01:00
52c023a305
Convert `Permalink` to Typescript
2024-01-14 19:22:39 +01:00
16499bc097
Rewrite `Permalink` as functional component
2024-01-14 19:22:39 +01:00
0213ae6b37
Extract glitch-soc-only i18n string
2024-01-14 16:32:08 +01:00
6772bf611e
[Glitch] Fix wrong color on active icons with counters in web UI
...
Port 728eb6a153
2024-01-14 16:32:08 +01:00
cc363629be
[Glitch] Fix focus and hover styles in web UI
...
Port cfd50f30bb
2024-01-14 16:32:08 +01:00
7565a328d0
[Glitch] change column link to add a better keyboard focus indicator
...
Port 6308dca76a
2024-01-14 16:32:08 +01:00
c1e28c8913
[Glitch] change focus ui for keyboard only input
...
Port 59478a1b46
2024-01-14 16:32:08 +01:00
a7bad8f45c
[Glitch] Fix profile setup showing default avatar in web UI
...
Port 01f0a6ca4f
2024-01-14 16:32:08 +01:00
b534532eaf
[Glitch] Change to single opt-in during profile setup in onboarding in web UI
...
Port 0e9801443f
2024-01-14 16:32:08 +01:00
bacb9134cc
[Glitch] Add profile setup to onboarding in web UI
...
Port d67bd44ca1
2024-01-14 16:32:08 +01:00
2653651bfa
[Glitch] Simplify column headers
...
Port 13d310e64d
2024-01-14 14:31:49 +01:00
ca17c2d35a
[Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage
...
Port 537442853f
2024-01-14 14:31:49 +01:00
e2c7c370dc
Fix size of glitch-soc status info icons
2024-01-14 00:09:28 +01:00
e2ba5f6e35
Fix glitch-soc high color privacy icons
2024-01-14 00:04:09 +01:00
e227e959f7
Fix glitch-soc textarea icons
2024-01-13 23:53:23 +01:00
6333900006
Fix glitch-soc CW media icons
2024-01-13 23:48:37 +01:00
46128f25b6
Fix glitch-soc status media icons
2024-01-13 23:35:53 +01:00
731f01adb1
[Glitch] Fix reply icon display in picture-in-picture footer
...
Port 1cba91d6d1
2024-01-13 23:19:01 +01:00
dd56900fac
[Glitch] Fixes dropdown target without a `buttonRef` (edit history)
...
Port 7b1d390734
2024-01-13 23:19:01 +01:00
a8c59c2506
[Glitch] Add icons for private and disabled boost in web UI
...
Port 7e3c10dec6
2024-01-13 23:19:01 +01:00
b2a6386b7d
[Glitch] Adjust transform origin for favorite star
...
Port e4e752c26e
2024-01-13 23:19:01 +01:00
6230d50f3f
[Glitch] Fix various icon styles in web UI
...
Port fa7e64df1d
2024-01-13 23:19:01 +01:00
b67d977e20
[Glitch] Add missing ban icons
...
Port a4e6fe36cb
2024-01-13 23:19:01 +01:00
9b32a37b6f
[Glitch] Fix missing icon props
...
Port f08ca3f042
2024-01-13 23:19:01 +01:00
d54414866c
[Glitch] Change icons in web UI
...
Port 134de736dc
2024-01-13 23:19:01 +01:00
5f8618443c
Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design
...
Port upstream's role badge design
2024-01-13 14:25:55 +01:00
eae3275fff
[Glitch] Change design of role badges in web UI
...
Port 2cbdff97ce
2024-01-13 13:09:04 +01:00
a40ce78f11
[Glitch] Add role badges to the WebUI
...
Port 1e4ccc655a
2024-01-13 12:50:27 +01:00
a25e03dbc3
Revert "Add role badges to WebUI ( #2096 )"
...
This reverts commit d9a078e6d3
2024-01-13 12:43:25 +01:00
d6609635cb
[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
...
Port 383be173af
2024-01-13 12:39:09 +01:00
ca31b4de3a
[Glitch] Add new emojis from `jdecked/twemoji` 15.0
...
Port b6e353537b
2024-01-13 12:39:09 +01:00
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
608f66f978
Change icon SVG imports to use a default import ( #28709 )
2024-01-12 10:31:24 +00:00
c6684aa1e3
Use the assets pipeline to load `inert.css` ( #28701 )
2024-01-12 09:32:45 +00:00
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-12 09:17:10 +00:00
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )
2024-01-12 03:39:11 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
e5b97eadd5
New Crowdin Translations (automated) ( #2502 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
204bbf49d2
New Crowdin Translations (automated) ( #28692 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
09376a8207
[Glitch] Upgrade Redux packages
...
Port a0e237a96f
2024-01-10 18:34:23 +01:00
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
2024-01-10 18:26:47 +01:00
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
2024-01-10 18:02:37 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
8e7d5fe2ac
New Crowdin Translations (automated) ( #28658 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-09 09:30:33 +00:00
cc67943df2
New Crowdin Translations (automated) ( #28627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-08 12:46:25 +00:00
a0e237a96f
Upgrade Redux packages ( #28585 )
2024-01-08 10:57:40 +00:00
43d800ada6
New Crowdin Translations (automated) ( #28604 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-05 11:29:19 +00:00
d0fd14f851
Fix scrolling to detailed status not always working ( #28577 )
2024-01-04 14:17:38 +00:00
bdf4750633
New Crowdin Translations (automated) ( #28590 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-04 09:24:13 +00:00
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
48c9192b47
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
...
Port 65ea097f1d
2024-01-02 18:16:57 +01:00
f685c953e5
Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream
2024-01-02 18:12:28 +01:00
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI ( #28559 )
2024-01-02 15:02:25 +00:00
0cd497ba7d
[Glitch] Fix OCR when using S3/CDN for assets
...
Port fdec8d7ffb
2024-01-02 13:37:04 +01:00
b3542ac57b
Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our README.
2024-01-02 13:35:11 +01:00
0374e11091
New Crowdin Translations (automated) ( #28529 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-02 09:11:53 +00:00
fdec8d7ffb
Fix OCR when using S3/CDN for assets ( #28551 )
2024-01-02 09:09:54 +00:00
eb342a6082
Fix media attachments not being hidden in report modal in glitch flavor
2023-12-29 17:47:30 +01:00
df43bb124c
[Glitch] Fix destructive actions in dropdowns not using error color in light theme
...
Port 3599622b5b
2023-12-29 17:43:53 +01:00
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
2023-12-29 17:40:57 +01:00
6374358357
Change media to be hidden/blurred by default in report modal ( #28522 )
2023-12-29 16:34:13 +00:00
3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
2023-12-29 11:32:40 +00:00
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-29 10:39:10 +00:00
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
2023-12-29 09:48:27 +00:00
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
2023-12-22 17:23:15 +01:00
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-22 07:58:20 +00:00
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
2023-12-21 20:19:18 +00:00
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
7a0be26367
[Glitch] Fix empty column explainer getting cropped under certain conditions
...
Port 3f1ec16377
2023-12-21 19:08:43 +01:00
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
2023-12-21 19:04:20 +01:00
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
2023-12-21 09:44:09 +00:00
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-21 09:09:00 +00:00
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
2023-12-21 08:32:25 +00:00
01e77a0f34
[Glitch] Enable the eslint `react/no-unknown-property` rule
...
Port ee83d5c760
2023-12-20 22:24:40 +01:00
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
5de551002d
[Glitch] Fix onboarding step descriptions being truncated on narrow screens
...
Port b20af17a2c
2023-12-20 21:59:58 +01:00
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
b41af99673
[Glitch] Change dismissed banners to be stored server-side
...
Port 7faa27e17d
2023-12-20 20:40:47 +01:00
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
2023-12-20 19:49:44 +01:00
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
2023-12-20 19:49:44 +01:00
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
2023-12-20 19:49:44 +01:00
e94fecdcc8
[Glitch] Fix the `notificationsUpdate` call
...
Port f476d9dab2
2023-12-20 19:49:44 +01:00
79678cf841
[Glitch] Fixes website not loading for unlogged users
...
Port 6712bf86cd
2023-12-20 19:49:44 +01:00
7fe5623a27
[Glitch] Use Immutable `Record` for accounts in Redux state
...
Port 3bf2a7296e
2023-12-20 19:49:44 +01:00
3b7caa00e2
[Glitch] Add Typescript types for some API objects
...
Port 57f592fed5
2023-12-20 19:49:44 +01:00
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
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-20 09:15:30 +00:00
b7cb17fecf
Fix the poll option add button attempting to submit a form ( #2530 )
2023-12-20 08:24:28 +01:00
9bfb699c4c
[Glitch] Change search popout to not list unusable search options when logged out
...
Port 6e70819840
2023-12-19 21:25:55 +01:00
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
Claire
Renaud Chaput
Erik Uden
Matt Jankowski
Eugen Rochko
github-actions[bot]
Sunny Ripert
neetshin
Mashiro
GitHub Actions
HTeuMeuLeu
Essem
Jeong Arm
Roni Laukkarinen
renovate[bot]
Evan Paterakis
Hinaloe
Nicolas Hoffmann
y.takahashi
Yamagishi Kazutoshi
J H
Danko Aleksejevs
JS Moore
Santiago Kozak
Josh Goldberg ✨
Trevor Wolf
zunda
gunchleoc
Michael Stanclift
Cal Moody