Commit Graph

3218 Commits (73a3228e0f51041da457ad452608b321b1cb8046)

Author SHA1 Message Date
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02:00
Claire 454d8567d4 Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
2023-07-30 13:49:35 +02:00
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
Claire a4ec187a20
Change the wording of the dismissable explore prompt (#25917) 2023-07-27 16:51:02 +02:00
Claire bbea052935
Fix emoji picker button scrolling with textarea content in single-column view (#25304) 2023-07-27 16:20:33 +02:00
Claire b4e739ff0f
Change interaction modal in web UI (#26075)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
Claire 1e4ccc655a
Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
github-actions[bot] b9adea9695
New Crowdin Translations (automated) (#26072)
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-26 13:46:16 +02:00
Christian Schmidt a4b69bec2e
Fix missing GIF badge in account gallery (#26166) 2023-07-26 03:33:31 +02:00
Christian Schmidt 6781dc6462
Preserve translation on status re-import (#26168) 2023-07-25 20:29:31 +02:00
Eugen Rochko f826a95f6e
Add published date and author to news on the explore screen in web UI (#26155) 2023-07-25 00:57:15 +02:00
Christian Schmidt 4299208487
Fix `lang` for UI texts in link preview (#26149) 2023-07-24 23:01:31 +02:00
Eugen Rochko 714a20697f
Fix missing action label on sensitive videos and embeds in web UI (#26135) 2023-07-24 22:04:38 +02:00
Christian Schmidt 76fce34ebb
Add `lang` attribute to trending links (#26111) 2023-07-24 13:48:23 +02:00
Eugen Rochko 6b2952d1dd
Change design of link previews in web UI (#26136) 2023-07-24 13:47:28 +02:00
Eugen Rochko 4d01d1a1ee
Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Eugen Rochko 5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI (#26126) 2023-07-23 17:55:20 +02:00
Eugen Rochko cfd50f30bb
Fix focus and hover styles in web UI (#26125) 2023-07-23 17:55:13 +02:00
наб 1b4cf0eba0
Favourits -> Favorites (#26109) 2023-07-21 21:13:20 +02:00
gunchleoc 217ef7f2af
Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
Trevor Wolf 59478a1b46
change focus ui for keyboard only input (#25935) 2023-07-21 13:20:14 +02:00
Claire e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to (#24685) 2023-07-21 13:14:30 +02:00
Stanislas Signoud 586b1c9dca
Fix a missing redirection on getting-started in multi column mode (#26070) 2023-07-20 14:46:02 +02:00
Christian Schmidt 4c18928a93
Wrong count in response when removing favourite/reblog (#24365)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
Claire 0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
github-actions[bot] 47832a1ac0
New Crowdin Translations (automated) (#26054)
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Claire d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Claire 71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
Stanislas Signoud 5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire 41f65edb21
Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Claire 25571b18ed Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
Renaud Chaput 447ab7ab24 [Glitch] Convert Home timeline components to Typescript
Port a75138d073 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
Claire 177497b367 Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
Claire 95a1fde6b6 Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Renaud Chaput a7253075d1
Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
Renaud Chaput a75138d073
Convert Home timeline components to Typescript (#25583) 2023-07-13 11:28:55 +02:00
Renaud Chaput 73b64b8917
Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
Claire 2aadebc769 Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
2023-07-12 15:54:58 +02:00
Claire 075887e1d6 Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Claire dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
2023-07-12 15:38:35 +02:00
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
Claire 7e54a30f06 Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Claire 67055b0343
Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
Stanislas Signoud 1392f31ed8
Fix sounds not being loaded from assets host (#25931) 2023-07-12 03:02:32 +02:00
Trevor Wolf ea10febd25
fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00