mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Go to file

Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property

2022-06-28 11:11:18 +02:00

.circleci

Revamp post filtering system (#18058 )

2022-06-28 09:42:13 +02:00

.devcontainer

Disable transpile to older iOS versions (#18462 )

2022-05-20 04:39:05 +02:00

.github

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

app

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

bin

Update Mastodon to Rails 6.1 (#15910 )

2021-03-24 10:44:31 +01:00

chart

Support STREAMING_API_BASE_URL in Helm Chart (#18408 )

2022-05-14 10:03:44 +02:00

config

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

dist

Also compress SVG and ICO images in nginx (#17651 )

2022-02-26 17:27:11 +01:00

lib

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

log

Initial commit

2016-02-20 22:53:20 +01:00

nanobox

Resync Nanobox files with the 2.9.0 release (#11083 )

2019-06-14 14:52:31 +02:00

public

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-21 08:28:59 +02:00

spec

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

streaming

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.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

.codeclimate.yml

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

.deepsource.toml

Update .deepsource.toml (#15753 )

2021-02-19 09:53:25 +01:00

.dockerignore

Update .dockerignore/.gitignore for #16947 etc (#17099 )

2021-12-06 18:04:04 +01:00

.editorconfig

Add final newline to locale files (#2890 )

2017-05-07 19:55:47 +02:00

.env.nanobox

Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287 )

2022-01-23 15:50:41 +01:00

.env.production.sample

Merge branch 'main' into glitch-soc/merge-upstream

2022-03-08 20:22:54 +01:00

.env.test

Bump webpacker from 4.0.7 to 4.2.0 (#12416 )

2019-11-20 17:56:11 +01:00

.env.vagrant

Add a default DB_HOST to .env.vagrant for enable the streaming (#14030 )

2020-06-15 01:57:06 +02:00

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

Update .dockerignore/.gitignore for #16947 etc (#17099 )

2021-12-06 18:04:04 +01:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

NodeJS 14 support - circleci/docker/.nvmrc (#16163 )

2021-08-10 22:56:13 +02:00

.prettierignore

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

.prettierrc.js

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop.yml

Change brand color and logotypes (#18592 )

2022-06-09 22:25:23 +02:00

.ruby-version

Upgrade Ruby to 3.0.3 (#17038 )

2021-11-24 20:29:05 +01:00

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.yarnclean

Replace from scss-lint to sass-lint (#10958 )

2019-06-04 17:23:18 +02:00

app.json

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

Aptfile

Remove protobuf dependencies (#17539 )

2022-02-14 16:08:02 +01:00

AUTHORS.md

Bump version to 3.5.0rc1 (#17618 )

2022-03-15 08:16:45 +01:00

babel.config.js

Remove dependency for @babel/plugin-proposal-class-properties (#16155 )

2021-05-04 23:13:04 +02:00

boxfile.yml

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CHANGELOG.md

Bump version to 3.5.3 (#18530 )

2022-05-26 23:26:15 +02:00

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

2019-06-06 17:42:07 +02:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-13 17:57:15 +02:00

crowdin.yml

Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085 )

2021-12-01 19:03:35 +01:00

docker-compose.yml

Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic (#18643 )

2022-06-15 16:35:36 +02:00

Dockerfile

Update Dockerfile (#18717 )

2022-06-27 09:02:48 +02:00

FEDERATION.md

Add FEDERATION.md (#17029 )

2021-11-23 00:15:31 +01:00

Gemfile

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

Gemfile.lock

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

ide-helper.js

Add JS IDE helper (#13012 )

2020-04-27 17:19:53 +02:00

jest.config.js

Merge branch 'main' into glitch-soc/merge-upstream

2022-05-04 19:15:50 +02:00

LICENSE

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

fix: make Procfile compatible with herokuish (#12685 )

2020-08-29 19:00:30 +02:00

Procfile.dev

Set RAILS_ENV in Procfile.dev (#15502 )

2021-01-07 09:30:12 +01:00

Rakefile

Initial commit

2016-02-20 22:53:20 +01:00

README.md

Drop support for Ruby v2.5 and Node.js v12 (#18323 )

2022-06-16 22:09:58 +02:00

scalingo.json

Format JSON and YAML using Prettier (#17823 )

2022-03-21 04:46:11 +01:00

SECURITY.md

Remove 3.3.x from supported versions in security policy (#18516 )

2022-05-26 18:43:14 +02:00

stylelint.config.js

Replace from Code Climate to Super-Linter (#18587 )

2022-06-01 19:22:35 +02:00

Vagrantfile

Merge branch 'main' into glitch-soc/merge-upstream

2022-02-17 10:58:44 +01:00

yarn.lock

Merge branch 'main' into glitch-soc/merge-upstream

2022-06-28 11:11:18 +02: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.

Languages

Ruby 40.4%

JavaScript 39.5%

SCSS 15.9%

Haml 3.9%

HTML 0.1%