闭社主体 https://thu.closed.social

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.		1 year ago
.circleci	Sync Node.js to 16.19 patch release (#23554)	1 year ago
.devcontainer	Install SSH server into devcontainer image (#22679)	1 year ago
.github	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
app	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
bin	Update Mastodon to Rails 6.1 (#15910)	3 years ago
chart	helm: cleanup helm chart, now in mastodon/chart (#21801)	1 year ago
config	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
db	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
dist	Fix nginx location matching (#20198)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
log	Initial commit	8 years ago
public	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
spec	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
streaming	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
vendor	Increase files checked by ESLint (#9705)	5 years ago
.browserslistrc	Add ES6 compatibility to browserslist (#18519)	2 years ago
.buildpacks	Remove nodejs buildpack from buildpacks (#14364)	4 years ago
.codeclimate.yml	Replace from Code Climate to Super-Linter (#18587)	2 years ago
.dockerignore	Update .dockerignore/.gitignore for #16947 etc (#17099)	3 years ago
.editorconfig	Enable EditorConfig trailing whitespace trimming (#23543)	1 year ago
.env.production.sample	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
.env.test	Bump webpacker from 4.0.7 to 4.2.0 (#12416)	5 years ago
.env.vagrant	Add a default DB_HOST to .env.vagrant for enable the streaming (#14030)	4 years ago
.eslintignore	Increase files checked by ESLint (#9705)	5 years ago
.eslintrc.js	Enable ESLint import recommended rules (#23315)	1 year ago
.foreman	Replace sprockets/browserify with Webpack (#2617)	7 years ago
.gitattributes	Add .gitattributes file to avoid unwanted CRLF (#3954)	7 years ago
.gitignore	helm: cleanup helm chart, now in mastodon/chart (#21801)	1 year ago
.gitmodules	Rename themes -> flavours ? ?	7 years ago
.haml-lint.yml	Added haml-lint and fix warnings (#2773)	7 years ago
.nanoignore	Remove Storybook (#4397)	7 years ago
.nvmrc	Sync Node.js to 16.19 patch release (#23554)	1 year ago
.prettierignore	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
.prettierrc.js	Format JSON and YAML using Prettier (#17823)	2 years ago
.profile	Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276)	7 years ago
.rspec	Adding a Mention model, test stubs	8 years ago
.rubocop.yml	Run Prettier on YML files (#22345)	1 year ago
.ruby-gemset	Make Mastodon use its own gemset (#17858)	2 years ago
.ruby-version	Update Ruby to 3.0.5 (#23544)	1 year ago
.slugignore	Remove Storybook (#4397)	7 years ago
.yarnclean	Replace from scss-lint to sass-lint (#10958)	5 years ago
AUTHORS.md	Update AUTHORS.md (#20630)	2 years ago
Aptfile	Remove packages that are provided by Heroku stacks (#19836)	1 year ago
CHANGELOG.md	Update changelog (#23515)	1 year ago
CODE_OF_CONDUCT.md	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
CONTRIBUTING.md	Add links to glitch-soc's Crowdin (#2033)	1 year ago
Capfile	remove capistrano/faster_assets from Capfile (#2737)	7 years ago
Dockerfile	Update Ruby to 3.0.5 (#23544)	1 year ago
FEDERATION.md	Add FEDERATION.md (#17029)	3 years ago
Gemfile	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Gemfile.lock	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
LICENSE	Fix #49 - License changed from GPL-2.0 to AGPL-3.0	8 years ago
Procfile	fix: make Procfile compatible with herokuish (#12685)	4 years ago
Procfile.dev	Set RAILS_ENV in Procfile.dev (#15502)	3 years ago
README.md	Remove reference to dev.glitch.social from README	2 years ago
Rakefile	Initial commit	8 years ago
SECURITY.md	Update SECURITY.md (#23545)	1 year ago
Vagrantfile	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
app.json	Make enable_starttls configurable by envvars (#20321)	2 years ago
babel.config.js	Remove dependency for @babel/plugin-proposal-class-properties (#16155)	3 years ago
config.ru	Apply Rubocop Style/ExpandPathArguments (#23450)	1 year ago
crowdin-glitch.yml	Add crowdin configuration file (#2030)	1 year ago
crowdin.yml	Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085)	3 years ago
docker-compose.yml	Update docker-compose.yml (#19063)	2 years ago
ide-helper.js	Add JS IDE helper (#13012)	4 years ago
jest.config.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
jsconfig.json	Correct prettier calls for YML/JSON (#21832)	1 year ago
package.json	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
postcss.config.js	Remove object-fit polyfill for the old Microsoft Edge (#22693)	1 year ago
priv-config	TOR federation (#7875)	6 years ago
scalingo.json	Make enable_starttls configurable by envvars (#20321)	2 years ago
stylelint.config.js	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
yarn.lock	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago

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.