Commit Graph

665 Commits

Author SHA1 Message Date
tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main'
# Conflicts:
#	app/controllers/concerns/sign_in_token_authentication_concern.rb
#	app/javascript/mastodon/features/compose/components/action_bar.js
#	app/javascript/mastodon/features/compose/index.js
2022-05-10 10:17:24 +02:00
Claire 703c7ae4b9 [Glitch] Fix floating action button obscuring last element
Port 5a448d0d71 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:21 +02:00
Claire e4bec702ac [Glitch] Rename toots to posts in various places, add or reword DM warnings
Port part of be0bc9acbf and 7e244879fe
to glitch-soc
2022-05-03 10:59:23 +02:00
Eugen Rochko 277c3fa816 [Glitch] Fix being able to scroll away from the loading bar in web UI
Port a8e27ac4d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-01 16:57:35 +02:00
Tykayn 7c32e3bc98 Merge remote-tracking branch 'glitch-soc/main' 2022-04-06 11:59:29 +02:00
quinn a73806ea32
Update composer.scss 2022-04-05 17:35:50 +10:00
quinn 1f0ff1ea98
Update status.scss 2022-04-05 17:17:00 +10:00
quinn e989147a91
Update composer.scss 2022-04-05 17:16:21 +10:00
Tykayn 8dc4088c88 style on homepage bliss 2022-03-29 11:38:56 +02:00
Eugen Rochko 6391a869ae [Glitch] Fix color of show more link in report dialog in web UI
Port 69f9dc4f4e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-23 09:32:59 +01:00
Eugen Rochko 33e7ef4d3d [Glitch] Fix wrong position of fade-out element in account card in web UI
Port d5df9d4797

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-22 18:00:38 +01:00
Eugen Rochko 91e6df7026 [Glitch] Add hint about missing media attachment description in web UI
Port 4e9855e09a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-22 17:55:17 +01:00
Claire 8eb3146487 [Glitch] Fix edit history dropdown and modal in light theme
Port 64d2988d18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-12 12:03:57 +01:00
Claire 43bce02a7a [Glitch] Fix report dialog being illegible using mastodon-light theme
Port 29ee3c61a3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 11:42:54 +01:00
Eugen Rochko 2c5faa5594 [Glitch] Add polls and media attachments to edit comparison modal in web UI
Port 9f2791eb64 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 11:30:48 +01:00
Claire 8b69634ab8 Move report modal styles to flavours/glitch/styles/components/modal.scss 2022-03-10 11:16:13 +01:00
Eugen Rochko 887d56aa8a [Glitch] Change design of federation pages in admin UI
Port front-end changes from 29ee3c61a3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-10 10:14:33 +01:00
Eugen Rochko 481f7c8c38 [Glitch] Change appearance of account cards in web UI
Port dba4be1038 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 20:52:49 +01:00
Josh Soref 69a4f17988 [Glitch] Spelling
Port front-end changes from b5329e0035 to glitch-soc

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 20:36:31 +01:00
Claire c69d94ef7e [Glitch] Change visual separation of applications in authorized apps list
Port SCSS changes from c0c4b5718d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 20:52:44 +01:00
Eugen Rochko 78781793d5 [Glitch] Add ability to mark statuses as sensitive from reports in admin UI
Port SCSS changes from 25d3dc4373 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 18:08:56 +01:00
Eugen Rochko 7f998ba94d [Glitch] Change authorized applications page
Port SCSS changes from 50ea54b3ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-03-02 18:07:57 +01:00
Claire 0a5a703a56 [Glitch] Fix remote reports with comments revealing remote reporter
Port SCSS changes from 57814a98a9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 21:17:22 +01:00
Claire 4eed5019a2 [Glitch] Fix media modal footer's “external link” not being a link
Port 255748dff4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 10:29:53 +01:00
Eugen Rochko 2e2b8a9a40 [Glitch] Add trending statuses
Port SCSS changes from 27965ce5ed

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-26 09:50:23 +01:00
Claire 41ef41b900 Fix publish buttons styling 2022-02-23 22:04:12 +01:00
Eugen Rochko 470c0a8002 [Glitch] Change report modal to include category selection in web UI
Port a9a43de6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-23 20:25:55 +01:00
Eugen Rochko 5169a9f9d9 [Glitch] Fix link colors in report and strike details
Port SCSS changes from 51e67f3243 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-22 18:10:08 +01:00
Eugen Rochko e07f2efc9f [Glitch] Fix wrong styles on strike page
Port SCSS changes from 8338826963

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-22 18:09:39 +01:00
Claire d70e4e3da0 [Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
Port 00b45b967e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 11:04:13 +01:00
Eugen Rochko 5ed35a0df4 [Glitch] Add appeals
Port SCSS changes from 564efd0651 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 10:58:57 +01:00
Eugen Rochko 3a0eba4918 [Glitch] Fix privacy policy link not being visible on small screens
Port bbd3474416 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-17 10:58:53 +01:00
Eugen Rochko f4db2e1832 [Glitch] Fix layout of the report page on smaller screens in admin UI
Port e848d281d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-12 13:15:07 +01:00
Eugen Rochko a34e4f7e27 [Glitch] Change actions in reports to require only one click
Port SCSS changes from d0fcf07436

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-11 21:56:27 +01:00
Eugen Rochko 44b06c4d96 [Glitch] Add edit history to web UI
Port fd3a45e348 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-02-09 17:51:35 +01:00
Claire 1b493c9fee Add optional hCaptcha support
Fixes #1649

This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`

Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
  reason)

The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above.
2022-01-24 21:22:13 +01:00
Eugen Rochko d4654dc892 [Glitch] Add support for editing for published statuses
Port front-end changes from 1060666c58 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-20 00:03:41 +01:00
Eugen Rochko 69208ef6ff [Glitch] Add notifications for statuses deleted by moderators
Port front-end changes from 14f436c457 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-01-17 11:19:44 +01:00
Eugen Rochko 9cecf59300 [Glitch] Add batch suspend for accounts in admin UI
Port SCSS changes from 2aafa5b4e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16 16:25:21 +01:00
Claire d911c17f52 Fix unneeded outline around list name edition input 2021-12-03 21:03:40 +01:00
Claire d5d44b431a [Glitch] Fix color of hashtag column settings inputs
Port 1630807ee2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26 22:58:13 +01:00
Jeong Arm 97151840b0 [Glitch] Port upstream changes about trending links 2021-11-26 11:36:22 +01:00
Claire 189cf652e6 [Glitch] Fix overflow of long profile fields in admin view
Port db32835338 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-19 18:55:27 +01:00
Claire f33878969a Fix some glitch-soc styling issues due to different class names
Partial fix to #1629
2021-11-12 16:29:36 +01:00
Mashiro dbbb077c19 [Glitch] Enhance dashboard styles
Port b58d32cfe2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-25 20:36:31 +02:00
Eugen Rochko 7aec1bc308 [Glitch] Add graphs and retention metrics to admin dashboard (#16829)
Port 07341e7aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-14 21:45:01 +02:00
Mélanie Chauvel cef109e046 [Glitch] Improve hover and focus style in columns settings
Port 900481b7fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-10-06 16:51:42 +02:00
Claire 0e62c38b02 [Glitch] Fix download button color in audio player
Port aaf24d3093 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-20 13:14:03 +02:00
Jeong Arm 8d55cb7d71 [Glitch] Fix trends layout
Port 6e0ab6814f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-08-09 23:40:31 +02:00
Claire a85eb7d930 Fix follow suggestions scrolling on mobile view
Also simplify the CSS a bit and bring it closer to upstream.
2021-07-12 10:22:57 +02:00