glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2 years ago
Claire	3fb7fe14c6	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208 ) * Run eslint --fix * Fix linting issues in video player and reduce divergences with upstream This includes a behavior change of not auto-looping videos anymore. I don't remember loops being ever intended, and they have been removed from upstream a while ago, but we somehow missed the change. * Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js` Those were basically caused by dead code that isn't present upstream, so that brings us closer to upstream as well. * Fix linting issue and bug in streaming/index.js * Fix linting issues in config/webpack/shared.js * Fix unused import in flavours/glitch/features/ui/index.js * Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx * Fix linting issues in flavours/glitch/reducers * Fix linting issues in glitch-soc onboarding modal * Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx * Remove dead code for unused local setting navbar_under * Fix various linting issues * Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream	2 years ago
Nick Schonning	1fe04f740a	Enable Rubocop Rails/FilePath (#23854 )	2 years ago
Matt Jankowski	2c6c398c60	Fix Performance/CollectionLiteralInLoop cop (#24819 )	2 years ago
Matt Jankowski	a1cca1c8b6	Update capistrano config lock version to match bundle (#24820 )	2 years ago
Matt Jankowski	d9a958fcf7	Fix Performance/RedundantMerge cop (#24817 )	2 years ago
Matt Jankowski	41eb49b984	Extract large route namespace blocks to separate files (#23914 )	2 years ago
Claire	32a030dd74	Rewrite import feature (#21054 )	2 years ago
Matt Jankowski	d902a707a3	Fix Rails/CompactBlank cop (#24690 )	2 years ago
Nick Schonning	6b95aaaa65	Remove empty HTTP error translations (#24210 )	2 years ago
Eugen Rochko	0a08e9d3d3	New Crowdin updates (#24678 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Mark Roszko	c23d285b16	Remove the u in Favorite for non-gb english (#24667 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
João Pedro Marques	8f6e290c7a	Adds new follower/following routes (#24601 )	2 years ago
Matt Jankowski	5a2aa06a51	Fix Rails/Present cop (#24688 )	2 years ago
mogaminsk	e0d075713f	Change i18n-fallbacks to English (#24727 )	2 years ago
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2 years ago
Nick Schonning	49fad26eca	Drop EOL Ruby 2.7 (#24237 )	2 years ago
Eugen Rochko	d4511f2a76	New Crowdin updates (#24617 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Christian Schmidt	5141697323	Remove `tai` locale (#23880 )	2 years ago
Nick Schonning	ef3675d688	Remove empty Kushubian (csb) local files (#24151 )	2 years ago
Nick Schonning	4687967176	Autofix Rubocop Style/NumericLiterals (#24468 )	2 years ago
Eugen Rochko	9d75b03ba4	New Crowdin updates (#24517 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
Eugen Rochko	e98c86050a	Refactor `Cache-Control` and `Vary` definitions (#24347 )	2 years ago
Robert R George	4db8230194	Add trend management to admin API (#24257 )	2 years ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	0cbd579ef0	New Crowdin updates (#2172 ) * New translations en.json (Spanish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Afrikaans) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Belarusian) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Frisian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Punjabi) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (English, United Kingdom) [ci skip] * New translations en.json (Burmese) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Faroese) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Uyghur) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Tatar) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Latin) [ci skip] * New translations en.json (Bosnian) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Sinhala) [ci skip] * New translations en.json (Cornish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Scottish Gaelic) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Aragonese) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Kurmanji (Kurdish)) [ci skip] * New translations en.json (Sorani (Kurdish)) [ci skip] * New translations en.json (Scots) [ci skip] * New translations en.json (Igbo) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Sanskrit) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Chinese Simplified) [ci skip]	2 years ago
Eugen Rochko	e5c0b16735	Add progress indicator to sign-up flow (#24545 )	2 years ago
Eugen Rochko	c5eba06d8c	New Crowdin updates (#24447 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	ce12934f5b	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.	2 years ago
Claire	ff168ef202	Fix most rubocop issues (#2165 ) * Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues	2 years ago
Claire	10469a0b85	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169 ) This reduces differences with upstream and fixes a bunch of locale-data files having been forgotten.	2 years ago
Eugen Rochko	c9f3438efe	New Crowdin updates (#24378 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	02d5c69404	New Crowdin updates (#2126 ) * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * Fix Crowdin YAML export issue * Fix i18n YAML normalization	2 years ago
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	5c499f54e3	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327 )	2 years ago
Eugen Rochko	4909c2e718	New Crowdin updates (#24276 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
fusagiko / takayamaki	4520e6473a	[Proposal] Make able to write React in Typescript (#16210 ) Co-authored-by: berlysia <berlysia@gmail.com> Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>	2 years ago
Claire	01d6f7529f	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.	2 years ago
Nick Schonning	500d6f93be	Autofix Rubocop Style/IdenticalConditionalBranches (#24322 )	2 years ago
Eugen Rochko	a9b5598c97	Change user settings to be stored in a more optimal way (#23630 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	e084b5b82d	Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200 )	2 years ago
Eugen Rochko	cf12621e37	New Crowdin updates (#24130 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	5ac380c122	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.	2 years ago
Simon Elvery	148c3d5894	Update profile link verification instructions (#19723 ) Co-authored-by: Effy Elden <effy@effy.space>	2 years ago
Matt Jankowski	7bef11630d	Remove references to non-existent actions (#24183 )	2 years ago
Eugen Rochko	0ca54a4105	Remove `Permissions-Policy` header from all responses (#24124 )	2 years ago
Plastikmensch	02ac94490a	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>	2 years ago
Claire	3091a184ca	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Jean byroot Boussier	160f38f03d	Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142 ) Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	2 years ago
CSDUMMI	d75a1e5054	Link to the Identity provider's account settings from the account settings (#24100 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	193250556c	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.	2 years ago
Claire	8fdf49b11d	Add warning for object storage misconfiguration (#24137 )	2 years ago
Eugen Rochko	75e5a6e437	Change user backups to use expiring URLs for download when possible (#24136 )	2 years ago
Eugen Rochko	a085901108	New Crowdin updates (#23904 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Christian Schmidt	bd047acc35	Replace `Status#translatable?` with language matrix in separate endpoint (#24037 )	2 years ago
Eugen Rochko	630436ab2d	Refactor monkey-patching of `PrivateAddressCheck` (#24122 )	2 years ago
Eugen Rochko	f0e727f958	Add cache headers to static files served through Rails (#24120 )	2 years ago
Eugen Rochko	8cb2543ee5	Add `SENDFILE_HEADER` environment variable (#24123 )	2 years ago
Eugen Rochko	6fa81ca17e	Remove `bullet` and `active_record_query_trace` gems (#24121 )	2 years ago
Claire	3ef5f62abf	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.	2 years ago
CSDUMMI	5dee40b5f5	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064 )	2 years ago
Claire	f432db7b9f	Fix sidekiq jobs not triggering Elasticsearch index updates (#24046 )	2 years ago
Nick Schonning	e594bb7d50	Convert CircleCI to GitHub Actions (#23608 )	2 years ago
Claire	59b24c3688	Fix `/api/v1/streaming` sub-paths not being redirected (#23988 )	2 years ago
Claire	21db91a0a8	Remove sidebar dead code (#23984 )	2 years ago
Claire	7f96391eae	Normalize translations	2 years ago
Claire	7623e18124	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.	2 years ago
Claire	bb4e211c86	New Crowdin updates (#2118 ) * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip]	2 years ago
Eugen Rochko	dfa9843ac8	Fix pgBouncer resetting application name on every transaction (#23958 )	2 years ago
Matt Jankowski	14f0b48fb6	Update browser gem to version 5.3.1 (#23945 )	2 years ago
Jean byroot Boussier	922837dc96	Upgrade to latest redis-rb 4.x and fix deprecations (#23616 ) Co-authored-by: Jean Boussier <jean.boussier@gmail.com>	2 years ago
Jamie Hoyle	de137e6bb0	Added support for specifying S3 storage classes in environment (#22480 )	2 years ago
Claire	02c6bad3ca	Change unintended SMTP read timeout from 5 seconds to 20 seconds (#23750 )	2 years ago
Claire	f8bb4d0d6b	Fix server error when failing to follow back followers from `/relationships` (#23787 )	2 years ago
Claire	276c1d32d6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	cb97ba7a2f	New Crowdin updates (#23802 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	4ed09276d5	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.	2 years ago
Matt Jankowski	730bb3e211	Remove unused HTML Validator (#23866 )	2 years ago
Eugen Rochko	2564117131	New Crowdin updates (#23625 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Renaud Chaput	44a7d87cb1	Rename JSX files with proper `.jsx` extension (#23733 )	2 years ago
Claire	7452a95998	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.	2 years ago
AcesFullOfKings	fef6c59b3a	Grammar fix (#23634 )	2 years ago
Claire	4c68189d2b	Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Nick Schonning	7e215b3bda	Check for missing i18n strings in CI (#23368 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	2be88d1930	New Crowdin updates (#2111 ) * New translations en.json (Korean) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * Fix root key name in pt-PT translation file * Fix normalization issue with ES translation * Fix issue with `no` locale in glitch-soc	2 years ago
Eugen Rochko	630975bf41	New Crowdin updates (#23527 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Thijs Kinkhorst	d15a9df6fe	Fix paths with url-encoded @ to redirect to the correct path (#23593 )	2 years ago
Claire	ce84d163cc	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.	2 years ago
Nick Schonning	db2c58d47a	Enable ESLint no-useless-escape (#23311 )	2 years ago
dependabot[bot]	31352f0d2c	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	8eb74c88ec	New Crowdin updates (#2100 ) * New translations en.json (Korean) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip]	2 years ago
Claire	87419f9307	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Eugen Rochko	71ae17e8f5	New Crowdin updates (#23413 ) * New translations en.json (Esperanto) * New translations en.yml (Slovak) * New translations en.json (Burmese) * New translations en.yml (Korean) * New translations en.json (Burmese) * New translations en.json (Burmese) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.json (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.json (Burmese) * New translations activerecord.en.yml (Burmese) * New translations en.yml (Burmese) * New translations activerecord.en.yml (Burmese) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations en.json (Catalan) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.json (Russian) * New translations en.json (Belarusian) * New translations en.json (Belarusian) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations doorkeeper.en.yml (Korean) * New translations en.json (Burmese) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations simple_form.en.yml (Belarusian) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.yml (English, United Kingdom) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations en.json (Asturian) * New translations en.yml (Asturian) * New translations en.json (Asturian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations devise.en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.yml (Burmese) * New translations en.json (Silesian) * New translations en.yml (Occitan) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.json (Occitan) * New translations activerecord.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * Normalize * Remove unused locales --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	4ceadc65b0	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Nick Schonning	f23d30100a	Cleanup unused i18n strings (#23426 ) * Remove partial 422/500 error translations * Add missing siblings for i18n unused warnings * Enable i18n unused string checking for all locales	2 years ago
Claire	85558a5e18	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.	2 years ago
Eugen Rochko	e2207af3d7	New Crowdin updates (#23393 ) * New translations en.yml (Portuguese) * New translations en.yml (Romanian) * New translations en.yml (Spanish) * New translations en.yml (Afrikaans) * New translations en.yml (Arabic) * New translations en.yml (Belarusian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (Basque) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Italian) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Polish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Punjabi) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Marathi) * New translations en.yml (Thai) * New translations en.yml (Croatian) * New translations en.yml (Kazakh) * New translations en.yml (Latvian) * New translations en.yml (Hindi) * New translations en.yml (Malay) * New translations en.yml (Telugu) * New translations en.yml (Burmese) * New translations en.yml (Welsh) * New translations en.yml (Faroese) * New translations en.yml (Uyghur) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Hebrew) * New translations en.json (Japanese) * New translations en.json (Romanian) * New translations en.json (Afrikaans) * New translations en.json (Danish) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Irish) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Breton) * New translations en.yml (Latin) * New translations en.yml (Bosnian) * New translations en.yml (French, Quebec) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Kannada) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Aragonese) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Scots) * New translations en.yml (Igbo) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.json (Uzbek) * New translations en.yml (Uzbek) * New translations en.json (Kashubian) * New translations en.yml (Kashubian) * New translations simple_form.en.yml (Slovenian) * New translations en.json (Georgian) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Slovenian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Galician) * New translations en.json (Persian) * New translations en.json (Tamil) * New translations en.json (Spanish, Argentina) * New translations en.json (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Marathi) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (Burmese) * New translations en.json (Faroese) * New translations en.json (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.json (Latin) * New translations en.json (Bosnian) * New translations en.json (French, Quebec) * New translations en.json (Sinhala) * New translations en.json (Cornish) * New translations en.json (Kannada) * New translations en.json (Scottish Gaelic) * New translations en.json (Asturian) * New translations en.json (Aragonese) * New translations en.json (Occitan) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Scots) * New translations en.json (Igbo) * New translations en.json (Corsican) * New translations en.json (Sardinian) * New translations en.json (Sanskrit) * New translations en.json (Kabyle) * New translations en.json (Ido) * New translations en.json (Taigi) * New translations en.json (Silesian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.json (Catalan) * New translations en.json (German) * New translations en.json (Korean) * New translations en.json (Portuguese) * New translations en.json (Thai) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Thai) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Thai) * New translations en.json (Hungarian) * New translations en.json (Spanish, Argentina) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.yml (German) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (German) * New translations en.json (German) * New translations en.json (Italian) * New translations en.json (Albanian) * New translations en.yml (German) * New translations en.yml (Russian) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Latvian) * New translations en.json (Polish) * New translations en.json (Russian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations simple_form.en.yml (Italian) * New translations en.json (French) * New translations en.json (Czech) * New translations simple_form.en.yml (French) * New translations en.json (Slovak) * New translations simple_form.en.yml (Slovak) * New translations en.json (German) * New translations en.json (English, United Kingdom) * New translations en.json (Esperanto) * New translations en.yml (German) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Esperanto) * New translations en.yml (Slovak) * New translations simple_form.en.yml (German) * New translations en.json (Spanish) * New translations en.yml (Asturian) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Spanish) * New translations en.json (Basque) * New translations en.json (Belarusian) * New translations en.json (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Faroese) * New translations en.json (Faroese) * New translations en.json (Korean) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations en.json (Korean) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Galician) * New translations en.json (Galician) * New translations simple_form.en.yml (Polish) * New translations en.json (French) * New translations en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations activerecord.en.yml (French) * New translations devise.en.yml (French) * New translations doorkeeper.en.yml (French) * New translations en.json (Icelandic) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations doorkeeper.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Danish) * New translations en.json (Danish) * New translations en.yml (English, United Kingdom) * New translations en.yml (Asturian) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Estonian) * New translations en.json (Estonian) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Frisian) * New translations en.json (Frisian) * Normalize --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	8651ef751e	New Crowdin updates (#23356 ) * New translations en.json (Korean) * New translations simple_form.en.yml (Japanese) * New translations en.yml (Korean) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Finnish) * New translations en.yml (English, United Kingdom) * New translations en.yml (Korean) * New translations en.yml (Esperanto) * New translations en.json (French) * New translations en.json (French) * New translations en.yml (French) * New translations en.yml (English, United Kingdom) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations en.json (Korean) * New translations en.json (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations en.yml (Danish) * New translations en.yml (Slovak) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Bulgarian) * New translations simple_form.en.yml (Danish) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Welsh) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Dutch) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Belarusian) * New translations simple_form.en.yml (Czech) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Irish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Italian) * New translations en.json (Japanese) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Malay) * New translations simple_form.en.yml (Faroese) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations simple_form.en.yml (French, Quebec) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations simple_form.en.yml (Aragonese) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Scots) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Kabyle) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Korean) * New translations en.json (Korean) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Spanish, Mexico) * Normalize --------- Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Eugen Rochko	8f590b0a21	Add setting for status page URL (#23390 )	2 years ago

1 2 3 4 5 ...

3127 Commits (587ddc2c7ff4bc02a61ac258afc1d764eb81988f)