glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	767cc06fe2	Merge branch 'master' into glitch-soc/merge-upstream 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.	6 years ago
Eugen Rochko	273e8f0474	Add remote interaction dialog for toots (#8202 ) * 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	6 years ago

Author

SHA1

Message

Date

Thibaut Girka

767cc06fe2

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

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.

Eugen Rochko

273e8f0474

Add remote interaction dialog for toots (#8202 )

* 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

2 Commits (1cbb97ea7f2552993ea425008442b8c6a44fbbcb)