mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity
21,699 commits 2 branches 0 tags 263 MiB
Commit graph

1,360 commits

Author SHA1 Message Date
Claire
f35ba6963d Merge commit '1959365c2f' 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 '5cd13ee4f1' 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 '2fe1b8d169' 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 'b7902225d6' 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 'd97d31cce6' 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 'f0c9cbaf3b' into glitch-soc/merge-upstream 2024-05-04 15:40:07 +02:00
Claire
d6f9c97ae4 Merge commit '7201f99cf8' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire
bac4026d80 Merge commit '85fdbd0ad5' 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 'a2399046ca' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire
6204d13a2e Merge commit 'ec71c02c4b' 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 'a390299744' 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 '0622107449' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c Merge commit '34e826f373' 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 '20b1e55f24' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire
3503fe1865 Merge commit '4045c069f8' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Claire
2c386d4cfe Merge commit 'c70c39cad0' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire
7f404fd635 Merge commit '90eb4a5d01' into glitch-soc/merge-upstream 2024-05-01 16:47:25 +02:00
Claire
3f61981f5d Merge commit '8a498f4e65' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire
7b46517c38 Merge commit 'd49343ed11' 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 '0cea7a623b' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire
1d1c3a808a Merge commit '6c381f20b1' 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 '119c7aa0df' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire
903dc53522 Merge commit '05eda8d193' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire
f2b23aa5f3 Merge commit '954b470fbc' 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