tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,936 Commits 10 Branches 0 Tags
941a9df28a59dca339c7ab0a6caf6235d0089bc9
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
2023-08-24 21:56:00 +02:00
.devcontainer
Do not start LibreTranslate and Elasticsearch on GitHub Codespaces (#26382)
2023-08-21 08:51:37 +02:00
.github
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
2023-08-24 21:56:00 +02:00
.husky
…
app
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
2023-08-24 21:56:00 +02:00
bin
Move the mastodon/*_cli files to mastodon/cli/* (#24139)
2023-05-23 16:08:26 +02:00
chart
…
config
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
2023-08-24 21:56:00 +02:00
db
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
dist
Make mastodon-streaming systemd unit templated (#24751)
2023-08-07 15:41:34 +02:00
lib
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
2023-08-24 21:56:00 +02:00
log
…
public
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
2023-08-13 18:47:15 +02:00
spec
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
streaming
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
vendor
…
.browserslistrc
…
.buildpacks
…
.dockerignore
…
.editorconfig
…
.env.production.sample
…
.env.test
…
.env.vagrant
Add elastic search installation into Vagrantfile (#26512)
2023-08-23 15:46:14 +02:00
.eslintignore
…
.eslintrc.js
Add eslint rule to forbid vanilla imports in glitch (#2293)
2023-07-13 21:36:23 +02:00
.foreman
…
.gitattributes
…
.gitignore
…
.gitmodules
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
.haml-lint_todo.yml
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop (#26039)
2023-07-20 17:03:39 +02:00
.haml-lint.yml
Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)
2023-06-02 19:58:18 +02:00
.nanoignore
…
.nvmrc
…
.prettierignore
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
2023-06-10 15:32:29 +02:00
.prettierrc.js
Use Prettier for ESLint formatting TypeScript (#23631)
2023-05-09 19:02:12 +02:00
.profile
Make it possible to upload audio and video to Heroku app (#24866)
2023-05-05 14:41:07 +02:00
.rspec
…
.rubocop_todo.yml
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
2023-08-24 21:26:27 +02:00
.rubocop.yml
Update rubocop rules for linelength (#26190)
2023-07-28 23:11:45 +02:00
.ruby-gemset
…
.ruby-version
…
.slugignore
…
.yarnclean
…
app.json
…
Aptfile
Make it possible to upload audio and video to Heroku app (#24866)
2023-05-05 14:41:07 +02:00
AUTHORS.md
…
babel.config.js
Update babel monorepo to v7.22.5 (#25405)
2023-06-14 09:22:54 +02:00
Capfile
…
CHANGELOG.md
Bump version to v4.2.0-beta2 (#26579)
2023-08-21 20:18:49 +02:00
CODE_OF_CONDUCT.md
…
config.ru
…
CONTRIBUTING.md
…
crowdin-glitch.yml
Fix Crowdin Github Action (#2311)
2023-07-19 08:36:25 +02:00
crowdin.yml
Add a Github Action to send translations to Crowdin for each merge in main (#25869)
2023-07-18 16:56:01 +02:00
docker-compose.yml
Bump version to v4.1.6 (#26272)
2023-07-31 21:11:25 +02:00
Dockerfile
Fix minor typos in comments and spec names (#21831)
2023-05-19 17:13:29 +02:00
FEDERATION.md
…
Gemfile
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Gemfile.lock
Update dependency rspec-sidekiq to v4 (#26627)
2023-08-24 09:03:40 +02:00
ide-helper.js
…
jest.config.js
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
2023-06-10 15:32:29 +02:00
jsconfig.json
…
LICENSE
…
package.json
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
2023-08-24 21:26:27 +02:00
postcss.config.js
…
priv-config
…
Procfile
…
Procfile.dev
…
Rakefile
Run Rubocop on Rakefile (#23871)
2023-07-12 09:47:54 +02:00
README.md
Update README.md (#25435)
2023-07-28 23:09:19 +02:00
scalingo.json
…
SECURITY.md
Update SECURITY.md to indicate issues can be reported on Github (#26599)
2023-08-22 16:47:19 +02:00
stylelint.config.js
…
tsconfig.json
Fix interaction modal being broken because of glitch-soc's theming system
2023-07-30 16:45:50 +02:00
Vagrantfile
Add elastic search installation into Vagrantfile (#26512)
2023-08-23 15:46:14 +02:00
yarn.lock
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
2023-08-24 21:56:00 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

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

Reference in New Issue View Git Blame Copy Permalink
S
Description
Wobbl.xyz Mastodon Instance code
Readme 204 MiB
Languages
Ruby 57.6%
JavaScript 26.6%
SCSS 10%
Haml 5.5%
HTML 0.2%