me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17508 commits 2 branches 0 tags 429 MiB
Commit graph

10741 commits

Author SHA1 Message Date
Claire
12eb6740d1 Fix Rails cache namespace being overriden with v2 for cached statuses (#24202) 2023-03-22 15:47:44 +01:00
Matt Jankowski
4e4b2bc78e Remove unused InstancePresenter methods (#24206) 2023-03-22 14:15:22 +01:00
Takeshi Umeda
df68ba2e6a Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00
mogamin
6ffb8609f9 Fit the max-width of media in .prose to parent box (#24180) 2023-03-20 20:04:25 +01:00
Matt Jankowski
7a82026971 Remove references to non-existent actions (#24183) 2023-03-20 20:03:44 +01:00
Plastikmensch
5569c86171 Add getting-started-misc to route (#2141) 
* Add getting-started-misc to web_app_paths

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add signed in check to navigation entries

Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.

Also fixed the keys as these were literally "i++".

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove "Extended information" from getting-started-misc

I couldn't find any reference to this translation string, so I removed it too.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-03-19 17:26:02 +01:00
Vyr Cossont
d1b3f02926 Webhooks for local status.create, status.update, account.update (#24133) 2023-03-19 07:47:54 +01:00
Claire
bcac7a5e06 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-18 11:21:03 +01:00
Jean byroot Boussier
dfc075c9d4 Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142) 
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
 2023-03-17 14:37:30 +01:00
Nick Schonning
8d05167e5f Include config/ and update all rubcop deps (#23963) 2023-03-17 10:13:28 +01:00
CSDUMMI
e7c5ccafca Link to the Identity provider's account settings from the account settings (#24100) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-17 10:09:01 +01:00
Christian Schmidt
bb60db4471 [Glitch] Replace Status#translatable? with language matrix in separate endpoint 
Port 7583523bf0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-16 23:21:08 +01:00
Claire
488cd37f1a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
 2023-03-16 23:12:59 +01:00
Claire
3b17f2f718 Add warning for object storage misconfiguration (#24137) 2023-03-16 22:47:01 +01:00
Eugen Rochko
ef0c6a43ed Change user backups to use expiring URLs for download when possible (#24136) 2023-03-16 22:46:52 +01:00
Eugen Rochko
83f302c101 New Crowdin updates (#23904) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-03-16 21:02:00 +09:00
Christian Schmidt
7583523bf0 Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
Eugen Rochko
f0734513f4 Refactor monkey-patching of PrivateAddressCheck (#24122) 2023-03-16 04:33:38 +01:00
Nick Schonning
0717d1b058 Autofix Rubocop Style/RedundantArgument (#23798) 2023-03-16 10:34:00 +09:00
Nick Schonning
994cb73f56 Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
Rodion Borisov
20af3cc038 [Glitch] Center the text itself in upload area 
Port 100ada1e2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-15 09:33:48 +01:00
PauloVilarinho
08685405f1 [Glitch] add modal message when editing toot 
Port c4c1c8aecc to glitch-soc

Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-15 09:33:14 +01:00
Claire
f39d9ab256 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
 2023-03-15 09:16:10 +01:00
Nick Schonning
30328759da Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
Claire
8a618c8eca Fix misleading error code when receiving invalid WebAuthn credentials (#23568) 2023-03-15 04:15:20 +01:00
Claire
5f11a64dbc Fix incorrect post links in strikes when the account is remote (#23611) 2023-03-15 04:14:47 +01:00
Claire
bde1c7aa96 Fix dashboard crash on ElasticSearch server error (#23751) 2023-03-15 04:01:49 +01:00
CSDUMMI
cfc04637b5 Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020) 2023-03-15 03:52:40 +01:00
Claire
23bce96f0c Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
CSDUMMI
5f9f43d051 Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073) 2023-03-13 00:06:27 +01:00
Rodion Borisov
100ada1e2b Center the text itself in upload area (#24029) 2023-03-09 14:35:44 +01:00
Christian Schmidt
170d3a0bc8 Unescape HTML entities (#24019) 2023-03-08 19:56:41 +01:00
Matt Jankowski
8ea6707b2b Remove unused TOCGenerator (#23986) 2023-03-06 17:33:58 +01:00
PauloVilarinho
c4c1c8aecc add modal message when editing toot (#23936) 
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
 2023-03-06 17:33:09 +01:00
Claire
aadb1317a5 Remove sidebar dead code (#23984) 2023-03-06 16:25:35 +01:00
Claire
980472efc8 Fix unconfirmed accounts being registered as active users (#23803) 2023-03-06 16:00:08 +01:00
Christian Schmidt
e7e90a5e63 Do not strip tags from Setting.site_short_description (#23975) 2023-03-06 15:37:19 +01:00
Claire
5f94d33a67 Refactor glitch-soc rich text SCSS 2023-03-05 21:31:45 +01:00
Christian Schmidt
a813ea3c25 [Glitch] Only offer translation for supported languages 
Port cc0c37cd69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-05 21:19:04 +01:00
Terry Garcia
81aac88f65 [Glitch] Switched bookmark and favourites around 
Port f5fe444913 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-05 21:07:55 +01:00
Claire
05763031f1 [Glitch] Fix duplicate “Publish” button on mobile 
Port 3faa229d8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-05 21:07:10 +01:00
Claire
a6363c3a2a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
 2023-03-05 20:46:56 +01:00
Claire
f7a679a4f5 New Crowdin updates (#2118) 
* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]
 2023-03-05 20:38:18 +01:00
Christian Schmidt
b50a08b15b [Glitch] Add lang attribute to media and poll options 
Port 41655e16ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-03-05 17:52:53 +01:00
Nick Schonning
f731ba595b Enable Rubocop for app/views (#23874) 2023-03-05 00:33:52 +01:00
Christian Schmidt
50b76430b4 Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
Matt Jankowski
471346fd3a User mailer spec coverage improvements (#23905) 2023-03-04 17:16:11 +01:00
Matt Jankowski
c48dd42fa8 Misc coverage improvements for validators (#23928) 2023-03-04 17:00:00 +01:00
Jean byroot Boussier
08c2938b4a Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
 2023-03-04 16:38:28 +01:00
Nick Schonning
24b0410744 Remove implied StandardError rescue (#23942) 2023-03-03 22:49:16 +01:00
Claire
fe098d35c2 Fix original account being unfollowed on migration before the follow request could be sent (#21957) 2023-03-03 21:13:55 +01:00
Claire
8f79c53cd6 Change ActivityPub::DeliveryWorker retries to be spread out more (#21956) 2023-03-03 21:08:22 +01:00
Christian Schmidt
cc0c37cd69 Only offer translation for supported languages (#23879) 2023-03-03 21:06:31 +01:00
Claire
5acc02793a Fix external authentication not running onboarding code for new users (#23458) 2023-03-03 20:45:55 +01:00
Claire
db0bbe5cb7 Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
Claire
05ef604007 Fix error when displaying post history of a trendable post in the admin interface (#23574) 2023-03-03 20:44:02 +01:00
Terry Garcia
f5fe444913 Switched bookmark and favourites around (#23701) 2023-03-03 20:37:49 +01:00
Claire
6943192f5e Fix server error when failing to follow back followers from /relationships (#23787) 2023-03-03 20:36:18 +01:00
Claire
3faa229d8d Fix duplicate “Publish” button on mobile (#23804) 2023-03-03 20:25:36 +01:00
Claire
7bc43c91a0 Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-03 20:25:15 +01:00
Claire
16c8144b1c Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
Claire
a95dc48e01 Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
Matt Jankowski
35cbd0685d Fix deprecation warning about merging conditions (#23618) 2023-03-02 16:21:04 +01:00
Matt Jankowski
5bf8f34842 Spec coverage for HomeHelper (#23907) 2023-03-02 10:04:14 +01:00
Eugen Rochko
096f622340 New Crowdin updates (#23802) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-28 23:01:05 +09:00
Nick Schonning
19be243493 Autofix Rubocop Style/HashConversion (#23852) 2023-02-28 22:59:19 +09:00
Matt Jankowski
9cf4671ba1 Remove unused admin/announcements helper (#23899) 2023-02-28 11:56:50 +01:00
Matt Jankowski
1d248c3f57 Remove unused InstancePresenter#sample_accounts method (#23900) 2023-02-27 19:03:35 +01:00
Matt Jankowski
385ae6681d Fix single-record invalid condition on PollVote (#23810) 2023-02-27 09:31:15 +01:00
Christian Schmidt
41655e16ea Add lang attribute to media and poll options (#23891) 2023-02-26 20:13:27 +01:00
Claire
42f73a411c Move misc rules from components/index.scss to components/misc.scss 2023-02-25 23:47:21 +01:00
Claire
59b7c6e3d8 Fix glitch-soc SCSS code style and refactor closer to upstream 2023-02-25 23:46:23 +01:00
Christian Schmidt
5eaad2ae5b [Glitch] Add lang attribute to preview card 
Port e56145661c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:57 +01:00
Tim Lucas
650ea1316a [Glitch] Increase contrast of upload progress background 
Port 808c9a7cf4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:43:24 +01:00
Botao Wang
213b82d0a4 [Glitch] Fix sidebar cut-off on small screens in admin UI 
Port 1f844d0d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:40:29 +01:00
Claire
5548b2c73f [Glitch] Add lang tag to native language names in language picker 
Port 82c464d4d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:37:05 +01:00
Renaud Chaput
295d193e7f [Glitch] Rename JSX files with proper .jsx extension 
Port ae3812d182 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Claire
f3cd30942c Fix building vanilla flavor after JSX change 2023-02-25 14:28:59 +01:00
Claire
f15ded319f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 2023-02-25 14:00:40 +01:00
Matt Jankowski
c759d6f31d Remove unused HTML Validator (#23866) 2023-02-24 20:06:32 +01:00
Christian Schmidt
e56145661c Add lang attribute to preview card (#23869) 2023-02-24 20:04:38 +01:00
Claire
bc4837a600 Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
Tim Lucas
808c9a7cf4 Increase contrast of upload progress background (#23836) 2023-02-23 12:58:42 +01:00
Eugen Rochko
6bfb54dccc New Crowdin updates (#23625) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-02-22 21:16:02 +09:00
Claire
0fb32f919f Fix inefficiency when searching accounts per username in admin interface (#23801) 2023-02-22 11:53:13 +01:00
Nick Schonning
4f6ad6475e Autofix Rubocop Rails/Blank (#23765) 2023-02-22 09:57:56 +09:00
Nick Schonning
247bf6e812 Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
Botao Wang
1f844d0d18 Fix sidebar cut-off on small screens in admin UI (#23764) 2023-02-21 10:06:13 +01:00
Claire
82c464d4d0 Add lang tag to native language names in language picker (#23749) 2023-02-21 09:23:39 +01:00
Nick Schonning
a0e4d69c12 Autofix Rubocop Rails/FindById (#23762) 2023-02-21 10:21:48 +09:00
Nick Schonning
eed0829d3f Autofix Rubocop Rails/WhereEquals (#23759) 2023-02-21 03:20:56 +09:00
Claire
b5b0bc17e8 Change compose form checkbox to native input with appearance: none (#22949) 2023-02-20 11:32:27 +01:00
Nick Schonning
dd63a919f0 Autofix Rubocop Style/RescueStandardError (#23745) 2023-02-20 11:01:20 +01:00
Christian Schmidt
2dbe2b56aa Make larger part of status clickable (#23621) 2023-02-20 08:11:23 +01:00
Nick Schonning
9b3be79cb5 Autofix Rubocop Style/FormatString (#23743) 2023-02-20 07:58:33 +01:00
Nick Schonning
e6312104c7 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
Nick Schonning
c08d9e5e5c Autofix Rubocop Style/UnpackFirst (#23741) 2023-02-20 06:51:43 +01:00
Nick Schonning
ac56c3971b Autofix Rubocop RSpec/ImplicitSubject (#23721) 2023-02-20 05:00:48 +01:00
Nick Schonning
448f0929a7 Autofix Rubocop Rails/EnumHash (#23737) 2023-02-20 05:00:36 +01:00
Renaud Chaput
ae3812d182 Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00