Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,358 Commits 74 Branches 58 Tags
656a41db2ac53329c4eca6897adfd6ce7d9b2344
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
.devcontainer
Update libretranslate/libretranslate Docker tag to v1.3.12 (#27214)
2023-09-29 15:34:55 +02:00
.github
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
2023-10-17 20:59:18 +02:00
.husky
Use Yarn instead of NPX for pre-commit hook (#24287)
2023-03-28 06:28:57 +02:00
app
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
2023-10-17 20:59:18 +02:00
bin
Move the mastodon/*_cli files to mastodon/cli/* (#24139)
2023-05-23 16:08:26 +02:00
chart
helm: cleanup helm chart, now in mastodon/chart (#21801)
2022-12-09 06:36:29 +01:00
config
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
2023-10-17 20:59:18 +02:00
db
Fix some settings not being properly migrated when set to false
2023-09-21 15:17:44 +02:00
dist
Add suggestion for secure cyphers to nginx.conf (#26349)
2023-08-31 12:17:10 +02:00
lib
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
2023-10-08 17:21:12 +02:00
log
…
public
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
2023-08-13 18:47:15 +02:00
spec
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
2023-10-17 20:59:18 +02:00
streaming
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
vendor
…
.browserslistrc
Add ES6 compatibility to browserslist (#18519)
2022-05-26 20:29:28 +02:00
.buildpacks
Remove nodejs buildpack from buildpacks (#14364)
2020-07-20 09:48:10 +02:00
.dockerignore
Update .dockerignore/.gitignore for #16947 etc (#17099)
2021-12-06 18:04:04 +01:00
.editorconfig
Enable EditorConfig trailing whitespace trimming (#23543)
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
…
.env.vagrant
Add elastic search installation into Vagrantfile (#26512)
2023-08-23 15:46:14 +02:00
.eslintignore
…
.eslintrc.js
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
.foreman
…
.gitattributes
…
.gitignore
Remove Capistrano (#27295)
2023-10-06 11:33:43 +02:00
.gitmodules
…
.haml-lint_todo.yml
Fix haml-lint InstanceVariables rule for auth/sessions/two_factor/o… (#27372)
2023-10-12 09:44:20 +02:00
.haml-lint.yml
Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)
2023-06-02 19:58:18 +02:00
.nanoignore
…
.nvmrc
Update dependency node to 20.8 (#27201)
2023-09-29 09:50:15 +02:00
.prettierignore
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02: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 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
2023-10-08 17:21:12 +02:00
.rubocop.yml
Move migration_helpers Rubocop ignore to config (#24236)
2023-10-03 14:58:40 +02:00
.ruby-gemset
Make Mastodon use its own gemset (#17858)
2022-08-13 15:44:34 +02:00
.ruby-version
Bump ruby to 3.2.2 due to ReDoS vulnerabilities (#24320)
2023-03-31 18:28:40 +02:00
.slugignore
…
.yarnclean
Setup Husky and lint-stage for commit fixing (#23308)
2023-03-27 05:17:19 +02:00
app.json
Make enable_starttls configurable by envvars (#20321)
2022-11-10 21:06:21 +01:00
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
Update babel monorepo to v7.22.5 (#25405)
2023-06-14 09:22:54 +02:00
CHANGELOG.md
Bump version to v4.2.0 (#27017)
2023-09-21 16:51:32 +02:00
CODE_OF_CONDUCT.md
Update Contributor Covenant to 2.1 (#23980)
2023-04-23 23:11:50 +02:00
config.ru
Autofix Rubocop remaining Layout rules (#23679)
2023-02-20 06:58:28 +01:00
CONTRIBUTING.md
Fix glitch-soc Markdown linting issues (#2168)
2023-04-08 17:23:24 +02: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
Bump version to v4.2.0 (#27017)
2023-09-21 16:51:32 +02:00
Dockerfile
Update Node.js to v20.8 (#27240)
2023-10-02 13:16:02 +02:00
FEDERATION.md
Update FEDERATION.md (#26819)
2023-09-06 16:28:31 +02:00
Gemfile
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Gemfile.lock
Update dependency rubocop to v1.57.1 (#27389)
2023-10-13 11:46:25 +02:00
ide-helper.js
…
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 (#21832)
2022-12-03 12:05:35 +09:00
LICENSE
…
package.json
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
2023-10-08 16:48:19 +02:00
postcss.config.js
Update PostCSS dependencies (#23835)
2023-03-15 04:01:10 +01:00
priv-config
…
Procfile
fix: make Procfile compatible with herokuish (#12685)
2020-08-29 19:00:30 +02:00
Procfile.dev
Support webpacker live-reloading on Docker (#26419)
2023-08-29 10:17:57 +02:00
Rakefile
Run Rubocop on Rakefile (#23871)
2023-07-12 09:47:54 +02:00
README.md
Update README requirements from node 14 to node 16 (#27369)
2023-10-11 16:24:28 +02:00
scalingo.json
Add S3 region list reference to Scalingo config (#24152)
2023-04-26 16:46:19 +02:00
SECURITY.md
Add 4.2.x to supported versions in SECURITY.md (#27317)
2023-10-07 21:12:21 +02: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
Add search tests (#26703)
2023-09-08 16:17:55 +02:00
yarn.lock
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00

README.md

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?

Description
A glitchy but lovable microblogging server
Readme AGPL-3.0 420 MiB
Languages
Ruby 49%
TypeScript 23.8%
JavaScript 17.2%
SCSS 6.5%
Haml 3.2%
Other 0.3%