monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
The glaceon.social flavour of glitch-soc, a Mastodon fork
4,183 Commits 1 Branch 0 Tags 290 MiB
Ruby 49.1%
JavaScript 25.2%
TypeScript 14.3%
SCSS 7.6%
Haml 3.4%
Other 0.4%
Go to file
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 		2017-09-09 14:27:47 -05:00
app Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
bin
…
config Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
db Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
docs
…
lib Use updated ActivityStreams context (added: sharedInbox) (#4764) 2017-09-02 14:00:58 +02:00
log
…
nanobox
…
public Merge upstream (#111) 2017-08-01 13:20:29 -07:00
spec Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
streaming
…
vendor/assets
…
.babelrc
…
.buildpacks
…
.codeclimate.yml
…
.dockerignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.editorconfig
…
.env.nanobox
…
.env.production.sample Show SMTP_TLS in config sample (#4477) 2017-08-01 15:00:29 +02:00
.env.test
…
.env.vagrant
…
.eslintignore
…
.eslintrc.yml Remove eslint-disable comments (#4681) 2017-08-24 12:15:36 +02:00
.foreman
…
.gitattributes
…
.gitignore fix #4356 : place sw.js to assets/sw.js (#4357) 2017-07-28 01:55:52 +02:00
.haml-lint.yml
…
.nanoignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.nvmrc
…
.postcssrc.yml
…
.profile
…
.rspec
…
.rubocop.yml Add handling of Linked Data Signatures in payloads (#4687) 2017-08-26 13:47:38 +02:00
.ruby-version
…
.scss-lint.yml
…
.slugignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.travis.yml Enable cache for babel-loader (#4505) 2017-08-03 17:46:49 +02:00
Aptfile Add libidn11 to Aptfile (#4475) 2017-08-01 05:58:08 +02:00
CODEOWNERS Introduce CODEOWNERS file (#4670) 2017-08-23 15:21:00 +02:00
CONTRIBUTING.md
…
Capfile
…
Dockerfile Update to Alpine 3.6 (#4747) 2017-08-30 23:52:19 +02:00
Gemfile Add handling of Linked Data Signatures in payloads (#4687) 2017-08-26 13:47:38 +02:00
Gemfile.lock Update bundler-audit and brakeman (#4740) 2017-08-30 03:30:13 +02:00
ISSUE_TEMPLATE.md
…
LICENSE
…
Procfile
…
Procfile.dev
…
README.md Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Rakefile
…
Vagrantfile Install libidn11-dev in Vagrant (#4238) 2017-07-18 00:31:43 +02:00
app.json Change logo URL for Heroku and Scalingo (#4476) 2017-08-01 05:59:11 +02:00
boxfile.yml [nanobox] Minor tweaks for 1.5 (#4395) 2017-07-27 15:13:32 +02:00
config.ru
…
docker-compose.yml
…
docker_entrypoint.sh
…
package.json fix(mocha): Run all tests (#4433) 2017-07-28 22:53:16 +02:00
scalingo.json Change logo URL for Heroku and Scalingo (#4476) 2017-08-01 05:59:11 +02:00
yarn.lock Update webpack and related dependencies (without extract-text-webpack-plugin) (#4410) 2017-07-28 05:16:12 +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?