| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-08-01 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. | |||
| 2018-07-31 | Drop glitch-style account bio fields | Thibaut Girka | |
| Upstream's implementation has been merged a while ago and is the preferred way to set fields, as it is the only one compatible with upstream and is more user-friendly. This commit deletes the legacy glitch-soc FrontMatter functionality in order to clean up the code and make it easier to maintain. | |||
| 2017-12-10 | Moved flavour UI into own prefs tab | kibigo! | |
| 2017-12-04 | Various fixes | kibigo! | |
| 2017-12-03 | Rename themes -> flavours ? ? | kibigo! | |
| 2017-11-30 | Skins support | kibigo! | |
| 2017-11-20 | Finalized theme loading and stuff | kibigo! | |
| 2017-11-18 | WIP static themeing | kibigo! | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |