mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-02 16:58:53 +09:00
Code
Glitch-YRYR (or YuruYuri Glitch), Mastodon glitch-soc fork for YuruVerse's YuruToot
10,987 Commits 1 Branch 1 Tag 329 MiB
Ruby 43.9%
JavaScript 28.4%
SCSS 11.6%
TypeScript 9.1%
CSS 3.7%
Other 3.3%
ab5ff638f2
Go to file
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
.circleci Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01: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-11-20 15:36:09 +01:00
app Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
bin
config Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
db Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
dist Add TLS v1.3 support (#11603) 2019-08-30 07:42:50 +02:00
lib Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01: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-11-20 15:36:09 +01:00
spec Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
streaming Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
vendor
.buildpacks
.codeclimate.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.dockerignore
.editorconfig
.env.nanobox ✨ Add an LDAP Mail attribute config (#12053) 2019-12-01 18:52:21 +01:00
.env.production.sample Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +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 fix vagrant connection error (#12180) 2019-10-24 22:47:24 +02:00
.eslintignore
.eslintrc.js
.foreman
.gitattributes
.gitignore Ignore development specfic env file (#12606) 2019-12-13 08:04:57 -05:00
.gitmodules
.haml-lint.yml
.nanoignore
.nvmrc
.profile
.rspec
.rubocop.yml Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
.ruby-version Use Ruby 2.6.5 (#12049) 2019-10-02 04:54:32 +02:00
.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
app.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Aptfile
AUTHORS.md Update AUTHORS.md (#12096) 2019-10-07 04:36:32 +02:00
babel.config.js Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
boxfile.yml Various updates for Nanobox deploys (#11988) 2019-10-02 00:25:25 +02:00
Capfile
CHANGELOG.md Update changelog for 3.0.1 (#12139) 2019-10-10 07:03:05 +02:00
CODE_OF_CONDUCT.md Change e-mail contact for CoC enforcement 2019-06-06 17:42:07 +02:00
config.ru
CONTRIBUTING.md Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
crowdin.yml Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
docker-compose.yml Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
Dockerfile Updated NodeJS in Dockerfile (#12492) 2019-11-29 17:03:20 +01:00
Gemfile Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
Gemfile.lock Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
LICENSE
package.json Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
postcss.config.js
priv-config
Procfile Bind servers to 0.0.0.0 in Procfile (#11378) 2019-07-22 06:16:30 +02:00
Procfile.dev
Rakefile
README.md Edit introduction of README.md (#12372) 2019-11-13 13:54:47 +01:00
scalingo.json Remove deprecated config from Heroku and Scalingo (#11925) 2019-09-23 12:11:59 +02:00
Vagrantfile
yarn.lock Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01: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?