| 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 | Compensate for scrollbar disappearing when media modal visible (#8100) | Eugen Rochko | |
| * Compensate for scrollbar disappearing when media modal visible Make auth pages backgrounds lighter * Fix typo | |||
| 2017-11-20 | Finalized theme loading and stuff | kibigo! | |
| 2017-08-03 | Redirect to PasswordController#new when reset_password_token is invalid (#4506) | nullkal | |
| 2016-11-15 | Fix rubocop issues, introduce usage of frozen literal to improve performance | Eugen Rochko | |
| 2016-03-26 | Remember user logins by default | Eugen Rochko | |
| 2016-03-05 | Customizing devise views and controllers | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |