Mastodon (Freak U edition). Fork of https://github.com/glitch-soc/mastodon
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
.circleci Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
.dependabot Change dependabot update schedule from live to weekly (#10949) 2019-06-04 11:23:19 +02:00
.github Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00
app Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
bin
config Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
db Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
dist
lib When cleaning up remote statuses, keep bookmarked ones 2019-07-18 13:34:54 +02:00
log
nanobox Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
public Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
spec Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
streaming Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 2019-07-16 16:10:19 +02:00
vendor
.buildpacks
.codeclimate.yml Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
.dockerignore
.editorconfig
.env.nanobox
.env.production.sample Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files 2019-06-24 16:27:10 +02:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml require rubocop-rails in .rubocop.yml (#10974) 2019-06-06 12:31:48 +02:00
.ruby-version
.sass-lint.yml Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
.slugignore
.yarnclean Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
AUTHORS.md
Aptfile
CHANGELOG.md Fix unconverted PRs in the changelog (#11155) 2019-06-22 18:13:52 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
Capfile
Dockerfile Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
Gemfile Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
Gemfile.lock Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
LICENSE
Procfile
Procfile.dev
README.md Change translations badge in README to Crowdin (#11054) 2019-06-12 15:56:41 +02:00
Rakefile
Vagrantfile
app.json
babel.config.js New Crowdin translations (#11077) 2019-06-18 22:58:18 +02:00
boxfile.yml Resync Nanobox files with the 2.9.0 release (#11083) 2019-06-14 14:52:31 +02:00
config.ru
crowdin.yml Update crowdin.yml 2019-06-12 15:11:00 +02:00
docker-compose.yml Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
package.json Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 2019-07-16 16:10:20 +02:00
postcss.config.js
priv-config
scalingo.json
yarn.lock Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 2019-07-16 16:10:20 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status

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