Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-08-18 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers. | |||
2018-08-18 | Add remote interaction dialog for toots (#8202) | Eugen Rochko | |
* Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests |