0 Fork 0

T

Claire 634acd07c4 Merge pull request #2580 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e2d9635074

2024-01-24 12:11:05 +01:00

.devcontainer

Update libretranslate/libretranslate Docker tag to v1.5.4 (#28727 )

2024-01-15 11:09:28 +00:00

.github

Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream

2023-12-29 17:40:57 +01:00

.husky

…

.yarn

Replace our custom compression-webpack-plugin patch with the fixed upstream version (#28510 )

2023-12-29 09:33:06 +00:00

app

[Glitch] Fix duplicate and missing keys in search popout component in web UI

2024-01-22 19:21:02 +01:00

bin

Use bundler version 2.5.4 (#28765 )

2024-01-17 14:35:55 +00:00

chart

…

config

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream

2024-01-18 22:16:16 +01:00

dist

Add suggestion for secure cyphers to nginx.conf (#26349 )

2023-08-31 12:17:10 +02:00

lib

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

log

…

public

Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream

2024-01-15 20:01:36 +01:00

spec

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

streaming

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

vendor

…

.browserslistrc

…

.buildpacks

…

.bundler-audit.yml

Ignore the devise-two-factor advisory as we have rate limits in place (#28733 )

2024-01-15 10:45:48 +00:00

.dockerignore

Do not copy public/packs-test into Docker (#27736 )

2023-11-07 09:22:04 +00:00

.editorconfig

…

.env.production.sample

…

.env.test

Improve Babel configuration and automatically load polyfills (#27333 )

2023-10-31 10:55:13 +00:00

.env.vagrant

Add elastic search installation into Vagrantfile (#26512 )

2023-08-23 15:46:14 +02:00

.eslintignore

…

.eslintrc.js

Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream

2024-01-10 18:26:47 +01:00

.foreman

…

.gitattributes

…

.gitignore

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

.gitmodules

…

.haml-lint_todo.yml

Fix LineLength haml-lint in media/player view (#28667 )

2024-01-10 09:35:01 +00:00

.haml-lint.yml

Update haml-lint line length configuration to match rubocop value (#27570 )

2023-10-31 09:47:16 +00:00

.nanoignore

…

.nvmrc

Update dependency node to 20.11 (#28670 )

2024-01-11 12:48:01 +00:00

.prettierignore

Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream

2024-01-13 12:11:29 +01:00

.prettierrc.js

Use Prettier for ESLint formatting TypeScript (#23631 )

2023-05-09 19:02:12 +02:00

.profile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

.rspec

…

.rubocop_todo.yml

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

.rubocop.yml

Fix Rails/RakeEnvironment cop (#28782 )

2024-01-17 16:33:17 +00:00

.ruby-gemset

…

.ruby-version

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

.simplecov

Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869 )

2023-11-15 23:09:31 +00:00

.slugignore

…

.watchmanconfig

Fix Jest config (#27834 )

2023-11-13 12:19:41 +00:00

.yarnrc.yml

Upgrade to Yarn 4, remove support for Node 16 (#27073 )

2023-11-08 10:57:21 +00:00

app.json

…

Aptfile

Make it possible to upload audio and video to Heroku app (#24866 )

2023-05-05 14:41:07 +02:00

AUTHORS.md

Update AUTHORS.md (#27018 )

2023-09-21 14:42:15 +02:00

babel.config.js

Disable Babel polyfill injection in dev (#27691 )

2023-11-06 10:24:41 +00:00

CHANGELOG.md

Prune the changelog of older entries (#27432 )

2023-10-23 14:35:56 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream

2023-12-21 18:17:17 +01:00

crowdin-glitch.yml

Fix Crowdin Github Action (#2311 )

2023-07-19 08:36:25 +02:00

crowdin.yml

Add a Github Action to send translations to Crowdin for each merge in main (#25869 )

2023-07-18 16:56:01 +02:00

docker-compose.yml

Change startup command for Puma in Docker Compose (#28138 )

2023-12-01 11:06:37 +00:00

Dockerfile

Use ruby version 3.2.3 (#28817 )

2024-01-22 11:55:51 +00:00

FEDERATION.md

docs: update FEDERATION.md to more closely follow FEP conventions. (#28838 )

2024-01-22 11:11:47 +00:00

Gemfile

Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream

2024-01-15 20:27:41 +01:00

Gemfile.lock

Update dependency kt-paperclip to v7.2.2 (#28813 )

2024-01-19 09:21:07 +00:00

ide-helper.js

…

jest.config.js

Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream

2024-01-15 20:06:31 +01:00

jsconfig.json

…

LICENSE

…

lint-staged.config.js

Improve lint-staged config (#28704 )

2024-01-12 09:09:57 +00:00

package.json

Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream

2024-01-15 20:27:41 +01:00

postcss.config.js

…

priv-config

…

Procfile

…

Procfile.dev

Split streaming server from web server (#24702 )

2023-11-14 17:43:20 +00:00

Rakefile

Run Rubocop on Rakefile (#23871 )

2023-07-12 09:47:54 +02:00

README.md

2024-01-01 19:08:01 +00:00

scalingo.json

…

SECURITY.md

Remove v3.5 branch from supported Mastodon versions (#28574 )

2024-01-03 15:04:10 +00:00

stylelint.config.js

…

tsconfig.json

Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream

2024-01-16 12:04:11 +01:00

Vagrantfile

Change Vagrant to install Node 20 (#28100 )

2023-11-30 10:46:06 +00:00

yarn.lock

Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream

2024-01-22 19:19:40 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.