| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-02-17 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages. | |||
| 2018-08-17 | Fix rails-ujs not being run on some settings pages (fixes #645) | Thibaut Girka | |
| 2018-01-15 | Fix mailer to use webpack core | kibi! | |
| 2018-01-12 | load public.js on vanilla#admin | Gô Shoemake | |
| 2017-12-10 | Screenshot support for themes | kibigo! | |
| 2017-12-10 | Javascript intl8n flavour support | kibigo! | |
| 2017-12-03 | Rename themes -> flavours ? ? | kibigo! | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |