c7fc7d0c2a
Merge pull request #2659 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3389c41b58
2024-03-01 18:34:00 +01: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
3389c41b58
Move `nobody` position in `UserRole` magic number to constant ( #29465 )
2024-03-01 11:05:24 +00:00
ec953bf378
Fix regression in handling `select` elements in `packs/admin.tsx` ( #29469 )
2024-03-01 10:16:35 +00:00
b9940eb977
Disable codecov comments on PRs ( #29464 )
2024-02-29 23:25:04 +00:00
71f673b3e6
Merge pull request #2656 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 958a810553
2024-02-29 20:38:25 +01: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
fd2e46847a
Merge pull request #2610 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2024-02-29 18:20:01 +01:00
958a810553
Convert `packs/admin.jsx` to Typescript ( #29425 )
2024-02-29 15:21:03 +00:00
6dfe318f34
Update dependency express to v4.18.3 ( #29458 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-29 15:20:39 +00:00
eb1b8f69de
Allow pagination `Link` headers on API accounts/statuses when pinned true ( #29442 )
2024-02-29 14:21:56 +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
6675bf574a
Extract `parsed_uri_query_values` helper in ap/replies controller spec ( #29410 )
2024-02-29 13:47:38 +00:00
1c4f36422d
Fix bogus translation files
2024-02-29 12:51:22 +01:00
e1fcb02867
Align `TagServersMeasure` to use `WITH` query style similar to others ( #29435 )
2024-02-29 11:00:58 +00:00
14c65180df
Use sequence in `software_update` fabricator to allow multiple ( #29438 )
2024-02-29 10:51:11 +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
0d55610f96
Merge pull request #2653 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 7f84bbfd92
2024-02-28 21:15:34 +01: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
a25c900a08
Merge pull request #2650 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 6f7615ba86
2024-02-27 20:36:13 +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
8f3c91fc3c
Add `change` block expectation to `admin/invites#deactivate_all` spec ( #29412 )
2024-02-27 16:25:58 +00:00
ea8e7f3e9d
Align `TagServersMeasure` query style with other classes ( #29414 )
2024-02-27 16:25:12 +00:00
3b31447408
Rework Prettier invocation ( #28851 )
2024-02-27 16:09:27 +00: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
6f7615ba86
Add basic end-to-end test for admin moderation interface ( #29424 )
2024-02-27 15:18:06 +00:00
036f5a05e3
Convert the streaming server to ESM ( #29389 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-27 14:59:20 +00:00
Claire