mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,402 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

1575 Commits (39fb314421740fab6132d34129fb7fb312aae7b4)

Author SHA1 Message Date
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
github-actions[bot] 1a37862a76
New Crowdin Translations (automated) (#30940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-08 08:03:44 +00:00
Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
github-actions[bot] 81547845ac
New Crowdin Translations (automated) (#30925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-05 09:09:40 +00:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
github-actions[bot] 8331f9e379
New Crowdin Translations (automated) (#30916) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-04 08:46:27 +00:00
Claire 70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
github-actions[bot] dd85e3bcc5
New Crowdin Translations (automated) (#30901) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-03 07:30:30 +00:00
github-actions[bot] 1fc14e324b
New Crowdin Translations (automated) (#30890) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-02 08:41:54 +00:00
Claire d270165be3 Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
github-actions[bot] 7756db6551
New Crowdin Translations (automated) (#30873) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-01 08:34:38 +00:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
github-actions[bot] a5134f2695
New Crowdin Translations (automated) (#30867) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-28 08:33:57 +00:00
github-actions[bot] 6d1c1fd684
New Crowdin Translations (automated) (#30851) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-27 08:00:04 +00:00
Eugen Rochko e89317d4c1
Add hover cards in web UI (#30754) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-26 19:33:38 +00:00
Claire 6f2771cb32 Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream 2024-06-25 17:57:39 +02:00
github-actions[bot] 052c90b8de
New Crowdin Translations (automated) (#30825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-25 07:45:58 +00:00
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
github-actions[bot] 61722b1b1f
New Crowdin Translations (automated) (#30808) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-24 10:46:53 +00:00
Claire 6300273664 Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream 2024-06-21 12:02:42 +02:00
github-actions[bot] 9e932fa1dd
New Crowdin Translations (automated) (#30789) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-21 09:14:44 +00:00
Claire 04e57efa55 Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream 2024-06-20 13:57:08 +02:00
github-actions[bot] a0910cd49c
New Crowdin Translations (automated) (#30772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-20 09:03:28 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
github-actions[bot] 50db95b9a1
New Crowdin Translations (automated) (#30746) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-18 12:39:36 +00:00
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Claire 8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's different theming system.
  Ported upstream's change.
 2024-06-17 18:14:14 +02:00
github-actions[bot] 35d52d7914
New Crowdin Translations (automated) (#30723) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-17 12:13:23 +00:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Eugen Rochko b9fd7571ae
Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
github-actions[bot] a7264a2b42
New Crowdin Translations (automated) (#30704) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-14 09:08:17 +00:00
github-actions[bot] dd587d29b6
New Crowdin Translations (automated) (#30684) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-13 13:30:07 +00:00
Eugen Rochko ed6d24330b
Add author links on the explore page in web UI (#30521) 2024-06-13 13:04:16 +00:00
github-actions[bot] ced463360e
New Crowdin Translations (automated) (#30666) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-12 10:48:31 +00:00
Claire 4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
github-actions[bot] 0dabda9bee
New Crowdin Translations (automated) (#30646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-11 07:14:52 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
github-actions[bot] bb27321781
New Crowdin Translations (automated) (#30608) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-10 14:29:30 +00:00
Claire 7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
github-actions[bot] c1b0c1a5e4
New Crowdin Translations (automated) (#30586) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-07 09:59:30 +00:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
github-actions[bot] a729104a41
New Crowdin Translations (automated) (#30575) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-06 08:53:28 +00:00
github-actions[bot] e4e3875452
New Crowdin Translations (automated) (#30543) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-05 07:52:25 +00:00
github-actions[bot] aa9b80f57d
New Crowdin Translations (automated) (#30517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-03 07:34:33 +00:00
github-actions[bot] dac4eba46b
New Crowdin Translations (automated) (#30499) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-31 09:26:52 +00:00
github-actions[bot] a0b525e50b
New Crowdin Translations (automated) (#30477) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-30 14:54:51 +00:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
github-actions[bot] 6eea83211c
New Crowdin Translations (automated) (#30464) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-29 11:12:23 +00:00
Eugen Rochko 128987eded
Add support for `fediverse:creator` OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
github-actions[bot] e5c3dc33a2
New Crowdin Translations (automated) (#30421) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-27 09:35:45 +00:00
Claire d76106da12 Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream 2024-05-24 17:08:21 +02:00
github-actions[bot] 54351d01f2
New Crowdin Translations (automated) (#30410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-24 08:26:38 +00:00
Claire 0e8633f6c7 Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream 2024-05-23 20:11:12 +02:00
github-actions[bot] 5b5a35cf96
New Crowdin Translations (automated) (#30402) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-23 08:26:29 +00:00
Claire 22d12229b2 Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream 2024-05-22 21:05:19 +02:00
github-actions[bot] a2b4c29c8f
New Crowdin Translations (automated) (#30394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-22 07:57:51 +00:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
github-actions[bot] eda2bdfc7a
New Crowdin Translations (automated) (#30383) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-21 08:48:36 +00:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
github-actions[bot] 8b75d18371
New Crowdin Translations (automated) (#30358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-20 07:41:38 +00:00
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
github-actions[bot] cdb042ae86
New Crowdin Translations (automated) (#30319) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-16 07:50:19 +00:00
github-actions[bot] aad5e841b5
New Crowdin Translations (automated) (#30290) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-15 08:53:57 +00:00
Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
github-actions[bot] 3a7aec2807
New Crowdin Translations (automated) (#30254) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-13 11:30:41 +00:00
Claire f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
github-actions[bot] c9557bdd3b
New Crowdin Translations (automated) (#30215) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-10 09:34:48 +00:00
Chee Aun c36a8786c1
Fix typo (#30224) 2024-05-10 09:19:27 +00:00
Claire f7dadc9f0b Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream 2024-05-07 12:13:02 +02:00
github-actions[bot] ed556db395
New Crowdin Translations (automated) (#30201) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-07 09:36:16 +00:00
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
github-actions[bot] 9be2c02e52
New Crowdin Translations (automated) (#30169) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-06 08:36:29 +00:00
Claire 3789d9f825 Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire a76980a229 Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire bac4026d80 Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
github-actions[bot] 309f352e6a
New Crowdin Translations (automated) (#30140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-02 08:57:30 +00:00
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 3503fe1865 Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Claire 2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire 7f404fd635 Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream 2024-05-01 16:47:25 +02:00
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
github-actions[bot] 56821ed879
New Crowdin Translations (automated) (#30128) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-30 09:05:53 +00:00
github-actions[bot] 9be7efedf0
New Crowdin Translations (automated) (#30092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-29 08:15:43 +00:00
github-actions[bot] 5201882a23
New Crowdin Translations (automated) (#30077) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-26 10:05:18 +00:00
Claire 4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Eugen Rochko 0ec061aa8f
Change design of people tab on explore in web UI (#30059) 2024-04-25 16:25:33 +00:00
github-actions[bot] 85fdbd0ad5
New Crowdin Translations (automated) (#30062) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-25 08:50:54 +00:00
github-actions[bot] ebcf9840f4
New Crowdin Translations (automated) (#30050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-24 08:45:24 +00:00
github-actions[bot] d754b15afb
New Crowdin Translations (automated) (#30034) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-23 09:07:05 +00:00
github-actions[bot] 3655fb6a22
New Crowdin Translations (automated) (#30014) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-22 08:42:35 +00:00
github-actions[bot] ec71c02c4b
New Crowdin Translations (automated) (#29994) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-19 13:57:43 +00:00
github-actions[bot] 443186ff40
New Crowdin Translations (automated) (#29980) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-18 11:18:39 +00:00
github-actions[bot] c35042b7eb
New Crowdin Translations (automated) (#29972) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-17 09:07:13 +00:00
Claire 66ee0d4a1f
Fix incorrect label for filtered notifications badge (#29922) 2024-04-16 09:25:23 +00:00
github-actions[bot] 285d4123b5
New Crowdin Translations (automated) (#29955) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-16 08:36:21 +00:00
github-actions[bot] 4e78cb9988
New Crowdin Translations (automated) (#29939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-15 09:29:39 +00:00
github-actions[bot] 5992df0762
New Crowdin Translations (automated) (#29920) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-12 08:19:48 +00:00
github-actions[bot] 20b1e55f24
New Crowdin Translations (automated) (#29903) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-11 10:30:31 +00:00
github-actions[bot] db5a5636d9
New Crowdin Translations (automated) (#29888) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-10 13:03:40 +00:00
github-actions[bot] 13faf26315
New Crowdin Translations (automated) (#29859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-08 13:44:54 +00:00
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 2024-04-06 21:01:40 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
github-actions[bot] 56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-03 09:04:29 +00:00
github-actions[bot] c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-02 09:26:06 +00:00
github-actions[bot] f96648d41c
New Crowdin Translations (automated) (#29796) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-29 13:35:50 +00:00
github-actions[bot] 8a498f4e65
New Crowdin Translations (automated) (#29785) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-28 14:48:09 +00:00
github-actions[bot] 1025fff6b9
New Crowdin Translations (automated) (#29772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-27 21:19:03 +00:00
github-actions[bot] b3d970bdb8
New Crowdin Translations (automated) (#29756) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-26 09:49:19 +00:00
Eugen Rochko 0cea7a623b
Fix background and icon on notification requests in web UI (#29706) 2024-03-25 13:39:06 +00:00
Eugen Rochko 29f9dc742e
Change design of notification about lost connections in web UI (#29731) 2024-03-25 13:27:38 +00:00
github-actions[bot] 799e3be9bd
New Crowdin Translations (automated) (#29726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-25 11:07:38 +00:00
Renaud Chaput 6c381f20b1
Restore advanced filter bar setting (#29737) 2024-03-24 14:17:06 +00:00
github-actions[bot] 5db5fa879b
New Crowdin Translations (automated) (#29708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-22 14:50:03 +00:00
Claire 885d0faf83
Fix duplicate translation string for severed relationships (#29689) 2024-03-21 10:06:21 +00:00
github-actions[bot] c007dd5dd2
New Crowdin Translations (automated) (#29687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-21 09:57:45 +00:00
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-20 12:27:52 +01:00
github-actions[bot] 6c0b1a41a1
New Crowdin Translations (automated) (#29657) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-20 08:39:42 +00:00
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
github-actions[bot] 4e61bce4e9
New Crowdin Translations (automated) (#29641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-19 08:36:52 +00:00
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-18 08:47:48 +00:00
Claire b8f476256e Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream 2024-03-15 22:48:04 +01:00
Claire d702a03a0c
Add “Learn more” on block modal to inform of federation caveats (#29614) 2024-03-15 19:09:21 +00:00
Claire 2c622497c2 Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream 2024-03-15 18:48:39 +01:00
Eugen Rochko ec19d0a14b
Change mute, block and domain block confirmations in web UI (#29576) 2024-03-15 17:36:41 +00:00
Eugen Rochko 407287573c
Add domain information to profiles in web UI (#29602) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 13:08:38 +00:00
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-15 10:02:10 +00:00
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Eugen Rochko 4991198b70
Change design of metadata underneath posts in web UI (#29585) 2024-03-14 09:18:24 +00:00
github-actions[bot] 5aea35de13
New Crowdin Translations (automated) (#29587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-14 09:00:42 +00:00
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2024-03-13 20:13:29 +01:00
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2024-03-13 18:56:40 +01:00
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-13 12:42:44 +00:00
Renaud Chaput af4e44e30a
Fix i18n typo (#29557) 2024-03-12 09:42:51 +00:00
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-12 09:03:51 +00:00
Claire 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
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
github-actions[bot] f85168b189
New Crowdin Translations (automated) (#29467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-11 07:37:04 +00:00
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
github-actions[bot] cdf5098166
New Crowdin Translations (automated) (#29452) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-29 09:38:33 +00:00
Claire ccdf56085d Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream 2024-02-28 20:37:38 +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
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
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 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
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
Claire 2dc244784c Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01:00
Claire d2cfc6e5e2 Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream 2024-02-24 15:02:28 +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 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
Claire 5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
Claire 20615a516d Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream 2024-02-24 13:53:59 +01: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 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
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
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
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
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
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
github-actions[bot] c07028b2fa
New Crowdin Translations (automated) (#29152) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-09 09:55:30 +00:00
github-actions[bot] 2a362d62a8
New Crowdin Translations (automated) (#29145) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-08 09:43:02 +00:00
github-actions[bot] 17052714a2
New Crowdin Translations (automated) (#29121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-07 12:38:37 +00:00
github-actions[bot] 90ccf7beb2
New Crowdin Translations (automated) (#28965) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-06 18:47:44 +00:00
Eugen Rochko 9cdc60ecc6
Change onboarding prompt to follow suggestions carousel in web UI (#28878) 2024-02-01 13:37:04 +00:00
Yamagishi Kazutoshi b3075a9993
Remove unused l18n messages (#28964) 2024-01-30 15:34:07 +00:00
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
github-actions[bot] 45287049ab
New Crowdin Translations (automated) (#28923) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-26 09:15:55 +00:00
Eugen Rochko 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
github-actions[bot] 59d2ea0d82
New Crowdin Translations (automated) (#28899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-25 13:00:44 +00:00
Claire 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
github-actions[bot] 78ee1453f9
New Crowdin Translations (automated) (#28857) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-23 10:11:37 +00:00
Claire 102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
github-actions[bot] 76e383ea1e
New Crowdin Translations (automated) (#28827) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-22 11:52:26 +00:00
github-actions[bot] 9cd17020bc
New Crowdin Translations (automated) (#28798) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-19 09:41:57 +00:00
Claire 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
github-actions[bot] 1ab42ad12b
New Crowdin Translations (automated) (#28749) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-17 14:23:14 +00:00
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
Claire 1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
github-actions[bot] 1012ffac9e
New Crowdin Translations (automated) (#28721) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-15 11:06:25 +00:00
github-actions[bot] b86083f0dc
New Crowdin Translations (automated) (#28708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-12 09:17:10 +00:00
Claire 15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Claire 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
github-actions[bot] 204bbf49d2
New Crowdin Translations (automated) (#28692) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-11 10:08:49 +00:00
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Claire 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
gunchleoc 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