CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
20,590 Commits 1 Branch 1 Tag 344 MiB
5bc39b3196
Commit Graph

1244 Commits

Author SHA1 Message Date
Claire
5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01: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
github-actions[bot]
8e7d5fe2ac
New Crowdin Translations (automated) (#28658) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 09:30:33 +00:00
github-actions[bot]
cc67943df2
New Crowdin Translations (automated) (#28627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-08 12:46:25 +00:00
github-actions[bot]
43d800ada6
New Crowdin Translations (automated) (#28604) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-05 11:29:19 +00:00
github-actions[bot]
bdf4750633
New Crowdin Translations (automated) (#28590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-04 09:24:13 +00:00
Claire
9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
github-actions[bot]
7cce2a41f2
New Crowdin Translations (automated) (#28573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-03 09:19:46 +00:00
Claire
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
github-actions[bot]
0374e11091
New Crowdin Translations (automated) (#28529) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-02 09:11:53 +00:00
Claire
35b6583371 Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream 2023-12-29 17:40:57 +01:00
github-actions[bot]
7df9c4f6f3
New Crowdin Translations (automated) (#28481) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-29 10:39:10 +00:00
Claire
c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
github-actions[bot]
e70a65761a
New Crowdin Translations (automated) (#28467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-22 07:58:20 +00:00
Claire
92aa6e2ec9 Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
Claire
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
Claire
a60b9acf3c Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
Claire
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
Eugen Rochko
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452) 2023-12-21 09:44:09 +00:00
github-actions[bot]
9e5ddc1745
New Crowdin Translations (automated) (#28451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-21 09:09:00 +00:00
Claire
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
github-actions[bot]
fecc07856c
New Crowdin Translations (automated) (#28439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-20 09:15:30 +00:00
Claire
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
Claire
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
Claire
d288a6162a Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream 2023-12-19 20:40:05 +01:00
Claire
b24f676cf1 Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
Claire
3ad92e8d0d Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream 2023-12-19 20:17:23 +01:00
github-actions[bot]
fa987db738
New Crowdin Translations (automated) (#28423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-19 09:40:37 +00:00
Claire
a111fd7a0b Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 2023-12-18 20:47:27 +01:00
Claire
d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
Claire
46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
github-actions[bot]
f99e05710e
New Crowdin Translations (automated) (#28373) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-18 08:25:21 +00:00
Claire
4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
 2023-12-17 23:04:16 +01:00