No description
Find a file
Claire e96a90480b
Merge pull request from ClearlyClaire/glitch-soc/merge-upstream
* Cleanup unused portions of statuses/status partial ()

* Wrong count in response when removing favourite/reblog ()

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Paperclip: add support for Azure blob storage ()

* Fix a missing redirection on getting-started in multi column mode ()

* Fix haml-lint Rubocop `Style/NumericPredicate` cop ()

* Change casing for 'Server Settings' string ()

* Move localized subject mailer shared example to separate file ()

* Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop ()

* Fix `Lint/Void` cop ()

* Add stricter protocol fields validation for accounts ()

* Improve the bug report templates ()

* Fix the crossorigin attribute ()

* Fix replica being used even if not explicitly defined ()

* Clean up unused application records ()

* Change thread view to scroll to the selected post rather than the post being replied to ()

* Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades ()

* change focus ui for keyboard only input ()

* Use username as display name for suspended users or users with blank display names ()

* Fix CSP headers being unintendedly wide ()

* Fix linting issue ()

* Replace 'favourite' by 'favorite' for American English ()

* Override default Action Mailer `preview_path` ()

* Favourits -> Favorites ()

* Bump version to v4.1.5 ()

* Fix incorrect connect timeout in outgoing requests ()

* Fix missing translation strings for importing lists ()

* Use valid email address for first account ()

* Update haml-lint 0.49.1 ()

* Fix focus and hover styles in web UI ()

* Remove back button from bookmarks, favourites and lists screens in web UI ()

* Remove 16:9 cropping from web UI ()

* Change design of link previews in web UI ()

* change poll form element colors to fit with the rest of the ui ()

* Add `lang` attribute to trending links ()

* Update dependency rdf-normalize to v0.6.1 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency brakeman to v6.0.1 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency postcss to v8.4.27 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix unexpected redirection to /explore after sign-in ()

* Update dependency aws-sdk-s3 to v1.131.0 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add report.updated webhook ()

* Fix LinkCrawlWorker crashing on `null` `created_at` ()

* Fix UI Overlap with the loupe icon in the Explore Tab ()

* Fix missing border on error screen in light theme in web UI ()

* Fix missing action label on sensitive videos and embeds in web UI ()

* Fix `lang` for UI texts in link preview ()

* Add published date and author to news on the explore screen in web UI ()

* Coverage for `Auth::OmniauthCallbacks` controller ()

* fix poll input active style ()

* Add `published_at` attribute to preview cards ()

* Update dependency sass to v1.64.1 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Revert poll colors to green outside of compose form ()

* Preserve translation on status re-import ()

* Fix missing GIF badge in account gallery ()

* Reformat large text arg in `FetchLinkCardService` spec ()

* Ignore long line in regex initializer ()

* Reformat large key values in service specs ()

* Reformat large hash in `ContextHelper` module ()

* Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration ()

* Extract private methods in `StatusCacheHydrator` ()

* New Crowdin Translations (automated) ()

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Remove the `sr` locale override .rb files ()

* Use correct naming on controller concern specs ()

* Migrate to request specs in `/api/v2/filters` ()

* Fix wrong filters sometimes applying in streaming ()

* Refactor streaming's filtering logic & improve documentation ()

* Add role badges to the WebUI ()

* Change interaction modal in web UI ()

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix crash when processing Flag activity with no status ()

* Storage: add :azure to remaining callers ()

* Remove queued_at value from pubsub payloads ()

* Fix emoji picker button scrolling with textarea content in single-column view ()

* Change the wording of the dismissable explore prompt ()

* Update dependency haml_lint to v0.49.2 ()

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix: Streaming server memory leak in HTTP EventSource cleanup ()

* Swap debug statements in streaming server ()

* Fix missing return values in streaming ()

* [Glitch] Wrong count in response when removing favourite/reblog

Port 4c18928a93 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix a missing redirection on getting-started in multi column mode

Port 586b1c9dca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change thread view to scroll to the selected post rather than the post being replied to

Port e4ea80d808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Replace 'favourite' by 'favorite' for American English

Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] change poll form element colors to fit with the rest of the ui

Port 80809ef33e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Add `lang` attribute to trending links

Port 76fce34ebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab

Port 9a567ec1d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing border on error screen in light theme in web UI

Port d1a9f601c7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing action label on sensitive videos and embeds in web UI

Port 714a20697f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] fix poll input active style

Port 49d2e8979f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Revert poll colors to green outside of compose form

Port ce1f35d7e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Add published date and author to news on the explore screen in web UI

Port f826a95f6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Preserve translation on status re-import

Port 6781dc6462 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix missing GIF badge in account gallery

Port a4b69bec2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix interaction modal being broken because of glitch-soc's theming system

* [Glitch] Change interaction modal in web UI

Port b4e739ff0f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Change the wording of the dismissable explore prompt

Port a4ec187a20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix CSP tests in glitch-soc

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: Misty De Méo <mistydemeo@gmail.com>
Co-authored-by: Stanislas Signoud <signez@stanisoft.net>
Co-authored-by: gunchleoc <fios@foramnagaidhlig.net>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Trevor Wolf <teeerevor@gmail.com>
Co-authored-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Co-authored-by: mogaminsk <mgmnjp@icloud.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com>
Co-authored-by: gol-cha <info@mevo.xyz>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
2023-07-30 21:35:47 +02:00
.devcontainer Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 () 2023-06-27 11:28:07 +02:00
.github Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
.husky Use Yarn instead of NPX for pre-commit hook () 2023-03-28 06:28:57 +02:00
app Merge pull request from ClearlyClaire/glitch-soc/merge-upstream 2023-07-30 21:35:47 +02:00
bin Move the mastodon/*_cli files to mastodon/cli/* () 2023-05-23 16:08:26 +02:00
chart helm: cleanup helm chart, now in mastodon/chart () 2022-12-09 06:36:29 +01:00
config Fix CSP tests in glitch-soc 2023-07-30 17:30:13 +02:00
db Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
dist Add hardened headers to user-uploaded files () 2023-07-06 14:31:37 +02:00
lib Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
log Initial commit 2016-02-20 22:53:20 +01:00
public Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
spec Fix CSP tests in glitch-soc 2023-07-30 17:30:13 +02:00
streaming Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
vendor Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
.browserslistrc Add ES6 compatibility to browserslist () 2022-05-26 20:29:28 +02:00
.buildpacks Remove nodejs buildpack from buildpacks () 2020-07-20 09:48:10 +02:00
.bundler-audit.yml Run bundler-audit on PRs () 2023-02-18 12:49:09 +01:00
.dockerignore Update .dockerignore/.gitignore for etc () 2021-12-06 18:04:04 +01:00
.editorconfig Enable EditorConfig trailing whitespace trimming () 2023-02-12 08:34:17 +01:00
.env.production.sample Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
.env.test Bump webpacker from 4.0.7 to 4.2.0 () 2019-11-20 17:56:11 +01:00
.env.vagrant Add a default DB_HOST to .env.vagrant for enable the streaming () 2020-06-15 01:57:06 +02:00
.eslintignore Increase files checked by ESLint () 2019-01-04 11:28:38 +01:00
.eslintrc.js Add eslint rule to forbid vanilla imports in glitch () 2023-07-13 21:36:23 +02:00
.foreman Replace sprockets/browserify with Webpack () 2017-05-03 02:04:16 +02:00
.gitattributes Add .gitattributes file to avoid unwanted CRLF () 2017-06-26 13:15:24 +02:00
.gitignore helm: cleanup helm chart, now in mastodon/chart () 2022-12-09 06:36:29 +01:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml Consistently use middle dot (·) instead of bullet (•) to separate items () 2023-06-02 19:58:18 +02:00
.haml-lint_todo.yml Fix haml-lint Rubocop Lint/UnusedBlockArguments cop () 2023-07-20 17:03:39 +02:00
.nanoignore Remove Storybook () 2017-07-27 22:30:27 +02:00
.nvmrc Update Node.js to 16.20.0 () 2023-04-07 14:26:11 +02:00
.prettierignore Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
.prettierrc.js Use Prettier for ESLint formatting TypeScript () 2023-05-09 19:02:12 +02:00
.profile Make it possible to upload audio and video to Heroku app () 2023-05-05 14:41:07 +02:00
.rspec Adding a Mention model, test stubs 2016-02-25 00:17:01 +01:00
.rubocop.yml Use correct naming on controller concern specs () 2023-07-27 14:27:21 +02:00
.rubocop_todo.yml Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
.ruby-gemset Make Mastodon use its own gemset () 2022-08-13 15:44:34 +02:00
.ruby-version Bump ruby to 3.2.2 due to ReDoS vulnerabilities () 2023-03-31 18:28:40 +02:00
.slugignore Remove Storybook () 2017-07-27 22:30:27 +02:00
.yarnclean Setup Husky and lint-stage for commit fixing () 2023-03-27 05:17:19 +02:00
app.json Make enable_starttls configurable by envvars () 2022-11-10 21:06:21 +01:00
Aptfile Make it possible to upload audio and video to Heroku app () 2023-05-05 14:41:07 +02:00
AUTHORS.md Update AUTHORS.md () 2022-11-14 08:33:24 +01:00
babel.config.js Update babel monorepo to v7.22.5 () 2023-06-14 09:22:54 +02:00
Capfile Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
CHANGELOG.md Bump version to v4.1.5 () 2023-07-21 21:23:14 +02:00
CODE_OF_CONDUCT.md Update Contributor Covenant to 2.1 () 2023-04-23 23:11:50 +02:00
config.ru Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
CONTRIBUTING.md Fix glitch-soc Markdown linting issues () 2023-04-08 17:23:24 +02:00
crowdin-glitch.yml Fix Crowdin Github Action () 2023-07-19 08:36:25 +02:00
crowdin.yml Add a Github Action to send translations to Crowdin for each merge in main () 2023-07-18 16:56:01 +02:00
docker-compose.yml Bump version to v4.1.5 () 2023-07-21 21:23:14 +02:00
Dockerfile Fix minor typos in comments and spec names () 2023-05-19 17:13:29 +02:00
FEDERATION.md Add FEDERATION.md () 2021-11-23 00:15:31 +01:00
Gemfile Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
Gemfile.lock Update dependency haml_lint to v0.49.2 () 2023-07-28 10:45:52 +02:00
ide-helper.js Add JS IDE helper () 2020-04-27 17:19:53 +02:00
jest.config.js Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream 2023-06-10 15:32:29 +02:00
jsconfig.json Correct prettier calls for YML/JSON () 2022-12-03 12:05:35 +09:00
LICENSE Fix - License changed from GPL-2.0 to AGPL-3.0 2016-09-21 23:04:34 +02:00
package.json Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
postcss.config.js Update PostCSS dependencies () 2023-03-15 04:01:10 +01:00
priv-config TOR federation () 2018-06-26 20:34:12 +02:00
Procfile fix: make Procfile compatible with herokuish () 2020-08-29 19:00:30 +02:00
Procfile.dev Set RAILS_ENV in Procfile.dev () 2021-01-07 09:30:12 +01:00
Rakefile Run Rubocop on Rakefile () 2023-07-12 09:47:54 +02:00
README.md Add MacOS M1/2 setup steps to README () 2023-07-18 09:02:45 +02:00
scalingo.json Add S3 region list reference to Scalingo config () 2023-04-26 16:46:19 +02:00
SECURITY.md Fix Markdown files with Prettier and check in CI () 2023-02-20 07:37:28 +01:00
stylelint.config.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
tsconfig.json Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
Vagrantfile Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
yarn.lock Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?