Go to file

Thibaut Girka 4be7313298 [Glitch] Allow joining several hashtags in a single column

Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.

2018-12-21 19:54:54 +01:00

.circleci

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-28 08:37:49 +01:00

.github

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

app

[Glitch] Allow joining several hashtags in a single column

2018-12-21 19:54:54 +01:00

bin

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

config

Add a per-user setting to hide followers count

2018-12-20 14:51:12 +01:00

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-15 10:45:53 +01:00

dist

Add nginx and systemd templates (#8770 )

2018-09-24 16:46:05 +02:00

lib

Override current_user when generating static pages

2018-12-19 20:49:58 +01:00

log

…

nanobox

Update Nginx config for Nanobox apps (#9310 )

2018-11-20 22:24:35 +01:00

public

Replace animated oops.gif by a non-animated image

2018-12-19 20:49:58 +01:00

spec

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-19 12:58:49 +01:00

streaming

Only stream local-only toots to logged-in users

2018-11-13 18:55:57 +01:00

vendor/assets

…

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

fix RuboCop error (#7442 )

2018-06-04 14:49:10 +02:00

.dockerignore

Add .bundle to .dockerignore (#7895 )

2018-06-26 20:33:29 +02:00

.editorconfig

…

.env.nanobox

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 )

2018-08-25 13:27:08 +02:00

.env.production.sample

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-26 14:23:24 +02:00

.env.test

Do not test PAM authentication by default (#9027 )

2018-10-20 07:32:26 +02:00

.env.vagrant

update vagrant configs (#8706 )

2018-09-16 14:49:15 -04:00

.eslintignore

…

.eslintrc.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-06-02 16:15:36 -05:00

.foreman

…

.gitattributes

…

.gitignore

Ignore elasticsearch directory (#7070 )

2018-04-08 16:57:16 +09:00

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

Upgrade Node.js to v8.x on nvmrc (#8023 )

2018-07-15 12:29:17 +09:00

.postcssrc.yml

…

.profile

…

.rspec

…

.rubocop.yml

Move more tasks to tootctl (#8675 )

2018-09-14 17:42:22 +02:00

.ruby-version

Use Ruby ==2.5.2== 2.5.3 (#9003 )

2018-10-18 22:32:47 +02:00

.scss-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

Update AUTHORS.md (#9141 )

2018-10-29 14:05:53 +01:00

babel.config.js

Upgrade Babel to version 7.0.0 (#5925 )

2018-09-14 17:59:48 +02:00

boxfile.yml

[Nanobox] Enable ElasticSearch support by default (#6977 )

2018-03-31 13:17:25 +02:00

Capfile

…

CHANGELOG.md

Bump version to 2.6.5 (#9413 )

2018-12-02 17:41:38 +01:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

docker-compose.yml

Persist volumes by default in docker-compose (#9055 )

2018-10-23 00:08:25 +02:00

Dockerfile

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-18 16:55:15 +01:00

Gemfile

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-18 16:55:15 +01:00

Gemfile.lock

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-18 16:55:15 +01:00

jest.config.js

…

LICENSE

…

package.json

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-30 20:16:26 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

…

Procfile.dev

Fix Procfile on OS X (#6748 )

2018-03-12 03:50:40 +01:00

Rakefile

…

README.md

Improve README (#9012 )

2018-10-19 18:49:35 +02:00

scalingo.json

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

stack-fix.c

dockerfile: Give more stack space to /sbin/tini.

2018-01-11 04:09:16 -06:00

Vagrantfile

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

yarn.lock

Merge branch 'master' into glitch-soc/merge-upstream

2018-11-30 20:16:26 +01:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

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?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 57.6%

JavaScript 26.6%

SCSS 10%

Haml 5.5%

HTML 0.2%