0 Fork 0

T

Thibaut Girka 2db0506226 Load custom CSS rules after standard ones

Fixes #933

Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.

They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.

2019-04-22 23:07:27 +02:00

.circleci

Fix CircleCI (#9695 )

2019-01-02 20:48:22 +01:00

.github

…

app

Load custom CSS rules after standard ones

2019-04-22 23:07:27 +02:00

bin

Bump webpacker from 3.5.5 to 4.0.2 (#10277 )

2019-03-15 15:05:31 +01:00

config

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

2019-04-22 20:40:04 +02:00

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

2019-04-10 09:16:08 +02:00

dist

Cache error 410 responses in recommended nginx configuration (#10425 )

2019-03-30 03:14:31 +01:00

lib

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

2019-04-22 20:40:04 +02:00

log

…

nanobox

Update Nginx config for Nanobox apps (#9310 )

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

public

Change error graphic to hover-to-play (#10055 )

2019-02-15 23:33:25 +01:00

spec

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

2019-04-10 21:19:21 +02:00

streaming

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

2019-03-11 11:23:50 +01:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.buildpacks

…

.codeclimate.yml

Upgrade ESLint to v5.x (#9694 )

2019-01-02 07:28:53 +01:00

.dockerignore

…

.editorconfig

…

.env.nanobox

…

.env.production.sample

…

.env.test

…

.env.vagrant

…

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Refactor icons in web UI to use Icon component (#9951 )

2019-02-01 00:14:05 +01:00

.foreman

…

.gitattributes

…

.gitignore

…

.gitmodules

…

.haml-lint.yml

…

.nanoignore

…

.nvmrc

…

.profile

…

.rspec

…

.rubocop.yml

Add tootctl self-destruct (#10367 )

2019-03-28 17:56:25 +01:00

.ruby-version

Upgrade Ruby to 2.6.1 (#9956 )

2019-02-20 11:57:08 +01:00

.scss-lint.yml

…

.slugignore

…

.yarnclean

…

app.json

…

Aptfile

…

AUTHORS.md

Bump version to 2.8.0rc1 (#10340 )

2019-03-30 02:13:42 +01:00

babel.config.js

Weblate translations (2019-04-10) (#10545 )

2019-04-10 18:17:24 +02:00

boxfile.yml

…

Capfile

…

CHANGELOG.md

Bump version to 2.8.0 (#10550 )

2019-04-10 23:32:08 +02:00

CODE_OF_CONDUCT.md

…

config.ru

…

CONTRIBUTING.md

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

2019-01-28 21:14:47 +01:00

docker-compose.yml

Remove uneeded command and switch to images for TOR (#9438 )

2019-01-04 16:15:09 +01:00

Dockerfile

Re-organize Dockerfile to improve incremental builds. (#10212 )

2019-03-08 16:12:48 +01:00

Gemfile

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

2019-04-22 20:40:04 +02:00

Gemfile.lock

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

2019-04-22 20:40:04 +02:00

LICENSE

…

package.json

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413 )

2019-03-30 01:41:35 +01:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

…

Procfile

…

Procfile.dev

…

Rakefile

…

README.md

2019-01-28 22:57:42 +01:00

scalingo.json

…

Vagrantfile

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

2019-03-10 16:48:44 +01:00

yarn.lock

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413 )

2019-03-30 01:41:35 +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.