17 Commits

Author	SHA1	Message	Date
Claire	425a6c90c4	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
Eugen Rochko	50ea54b3ed	Change authorized applications page (#17656) ... * Change authorized applications page * Hide revoke button for superapps and suspended accounts * Clean up db/schema.rb	2022-03-01 16:48:58 +01:00
Claire	5e11f3a6e1	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.	2021-02-12 10:28:32 +01:00
Jeong Arm	d499bb031f	Use custom mascot on static share page (#15687) ... * Use custom mascot on static share page * Use full_asset_url	2021-02-11 02:18:56 +01:00
Eugen Rochko	9b1f2a4b61	Add subresource integrity for JS and CSS assets (#15096) ... Fix #2744	2020-11-06 11:56:31 +01:00
Eugen Rochko	3d7f68c273	Revert Font Awesome 5 upgrade (#8810) ... * Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591b. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d.	2018-09-28 02:11:14 +02:00
mayaeh	17af4d27da	Update the icon name changed by the Font Awesome 5. (#8776)	2018-09-25 15:52:12 +02:00
Thibaut Girka	cd99255698	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.	2018-09-11 16:51:26 +02:00
Eugen Rochko	2288d50a7b	Add force_login option to OAuth authorize page (#8655) ... * Add force_login option to OAuth authorize page For when a user needs to sign into an app from multiple accounts on the same server * When logging out from modal header, redirect back after re-login	2018-09-09 04:10:44 +02:00
Thibaut Girka	bfeac6747a	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.	2018-08-18 18:04:49 +02:00
Eugen Rochko	78fa926ed5	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	2018-08-18 03:03:12 +02:00
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	2018-02-23 23:28:31 +09:00
Eugen Rochko	5f3bee345d	Fix container regression (#6531) ... * Update public.html.haml * Update auth.html.haml * Update modal.html.haml	2018-02-22 03:04:27 +01:00
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	2018-01-02 00:11:41 -06:00
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	2017-08-05 04:24:58 +02:00