1
0
A YuruToot variation in Fediverse https://puyopuyotetr.is
Go to file
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
.circleci Remove unnecessary hyphen from restore_cache key (#7276) 2018-04-28 11:20:30 +02: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 gs-master 2018-05-03 17:23:44 -05:00
bin Upgrade Rails to version 5.2.0 (#5898) 2018-04-12 14:45:17 +02:00
config Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
db db: make schema.rb version subsume bookmarks migration. 2018-04-18 19:08:35 -05:00
docs Fix redirect link on Tuning.md (#1595) 2017-04-12 12:40:37 +02:00
lib Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
log Initial commit 2016-02-20 22:53:20 +01:00
nanobox [Nanobox] Tuning Update (#6660) 2018-03-06 21:59:35 +01:00
public Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-11 00:50:09 +00:00
spec Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
streaming Direct messages column (#4514) 2018-04-18 13:09:06 +02:00
vendor/assets Initial commit 2016-02-20 22:53:20 +01:00
.babelrc Remove debug option from Babel preset env (#6852) 2018-03-21 10:26:15 +01:00
.buildpacks Add heroku APT buildpack for scalingo. (#3051) 2017-05-14 12:57:13 +02:00
.codeclimate.yml Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
.dockerignore Ignore elasticsearch directory (#7070) 2018-04-08 16:57:16 +09:00
.editorconfig Add final newline to locale files (#2890) 2017-05-07 19:55:47 +02:00
.env.nanobox [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
.env.production.sample Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
.env.test Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
.env.vagrant Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant 2017-01-26 19:22:59 +11:00
.eslintignore Dev Tooling fixes (eslint/editorconfig) (#1398) 2017-04-11 00:36:03 +02:00
.eslintrc.yml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00: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 Ignore elasticsearch directory (#7070) 2018-04-08 16:57:16 +09: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 update Node to 6.x LTS (#1228) 2017-04-15 02:05:41 +02:00
.postcssrc.yml Add object-fit polyfill for Edge (#4182) 2017-07-14 01:59:34 +02: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 Add handling of Linked Data Signatures in payloads (#4687) 2017-08-26 13:47:38 +02:00
.ruby-version Update Ruby to version 2.4.4 (#6964) 2018-04-01 23:43:08 +02:00
.scss-lint.yml Enable CodeClimate SCSS Lint checks (#2886) 2017-05-07 20:47:31 +02:00
.slugignore Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
.travis.yml Replace Travis to CircleCI (#7196) 2018-04-20 13:46:08 +02:00
.yarnclean Reduce container size with clean yarn (#3506) 2017-09-30 22:05:24 +02:00
app.json Change logo URL for Heroku and Scalingo (#4476) 2017-08-01 05:59:11 +02:00
Aptfile Specify libicu explicitly in Aptfile (#4920) 2017-09-13 09:30:13 +02:00
AUTHORS.md docs: Add AUTHORS file (#6685) 2018-03-09 13:11:43 +01:00
boxfile.yml [Nanobox] Enable ElasticSearch support by default (#6977) 2018-03-31 13:17:25 +02:00
Capfile remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
CODE_OF_CONDUCT.md update code of conduct email address 2017-11-21 11:01:28 -05:00
config.ru Fix rubocop issues, introduce usage of frozen literal to improve performance 2016-11-15 16:56:29 +01:00
CONTRIBUTING.md Added link to docs website 2017-07-14 09:42:50 -07:00
docker-compose.yml docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) 2018-04-15 13:57:58 +02:00
Dockerfile Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
Gemfile Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
Gemfile.lock Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
jest.config.js Removed glitch tests 2017-11-17 19:29:17 -08: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 remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00
Procfile More robust PuSH subscription refreshes (#2799) 2017-05-05 02:23:01 +02:00
Procfile.dev Fix Procfile on OS X (#6748) 2018-03-12 03:50:40 +01:00
Rakefile Initial commit 2016-02-20 22:53:20 +01:00
README.md Replace badge to CircleCI (#7216) 2018-04-21 21:56:40 +02:00
scalingo.json Missing OTP_SECRET in scalingo.json (#6917) 2018-03-26 12:47:34 +02:00
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 Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps 2018-04-27 01:24:55 +02:00

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?