luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 05:13:01 +00:00
Code Issues Projects Releases Wiki Activity
A glitchy but lovable microblogging server
5848 commits 1 branch 0 tags 248 MiB
Ruby 62.3%
JavaScript 24%
SCSS 6.9%
Haml 5%
TypeScript 1.5%
Other 0.2%
Go to file
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
.github Move files for GitHub to .github directory (#5989) 2017-12-12 15:10:12 +01:00
app Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
bin Update dependencies for Ruby (2017-10-30) (#5566) 2017-10-31 12:22:32 +01:00
config Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
db Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
docs
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
log
nanobox [Nanobox] Apply Release Notes Changes (#5670) 2017-11-15 16:26:53 +01:00
public Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
spec Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
streaming Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
vendor/assets
.babelrc
.buildpacks
.codeclimate.yml Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
.dockerignore
.editorconfig
.env.nanobox [Nanobox] Apply Release Notes Changes (#5670) 2017-11-15 16:26:53 +01:00
.env.production.sample Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
.env.test
.env.vagrant
.eslintignore
.eslintrc.yml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
.foreman
.gitattributes
.gitignore Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288) 2017-10-09 20:51:24 +02:00
.gitmodules Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
.haml-lint.yml
.nanoignore
.nvmrc
.postcssrc.yml
.profile
.rspec
.rubocop.yml
.ruby-version Add support Ruby v2.5.0 (#6097) 2018-01-19 20:53:30 +01:00
.scss-lint.yml
.slugignore
.travis.yml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-19 15:17:14 +00:00
.yarnclean Reduce container size with clean yarn (#3506) 2017-09-30 22:05:24 +02:00
app.json
Aptfile
boxfile.yml [Nanobox] Fix backups for file storage (#6483) 2018-02-16 17:10:01 +01:00
Capfile
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
config.ru
CONTRIBUTING.md
docker-compose.yml Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
Dockerfile Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
Gemfile Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
Gemfile.lock Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
jest.config.js Removed glitch tests 2017-11-17 19:29:17 -08:00
LICENSE
package.json Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
Procfile
Procfile.dev Upgrade Webpacker to version 3.0.1 (#5122) 2017-09-27 14:41:54 +02:00
Rakefile
README.md Add Liberapay link to README.md (#6563) 2018-02-26 16:20:47 +01:00
scalingo.json
stack-fix.c dockerfile: Give more stack space to /sbin/tini. 2018-01-11 04:09:16 -06:00
Vagrantfile Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
yarn.lock Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00: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?