842 Commits (1b0ce85e3da4b5c1941f65da7d73258da6eed6d0)

Author	SHA1	Message	Date
Thibaut Girka	20d01a954e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.	7 years ago
Mélanie Chauvel (ariasuni)	4168aeb234	Avoid cutting bottom of letters of last paragraph of statuses (#10821)	7 years ago
Eugen Rochko	1e5532e693	Add responsive panels to the single-column layout (#10820) ... * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager	7 years ago
Thibaut Girka	652147a3f4	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - streaming/index.js	7 years ago
Eugen Rochko	84dc21d55d	Various improvements to single column layout (#10809) ... - Add potential side panels to single column layout - Hide FAB on large screens	7 years ago
Thibaut Girka	c0dc247bce	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	7 years ago
Eugen Rochko	9ddeb30f90	Add `forceSingleColumn` prop to `<UI />` (#10807) ... * Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes	7 years ago
nzws	8a378d4c3d	Fix stacking order of emoji picker (#10801)	7 years ago
Thibaut Girka	6badf2d252	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Neil Moore	4ab094d35e	Adds click-able div that expands status (#10733) (#10766) ... The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status.	7 years ago
nzws	3e15a845c1	Fix some colors in light theme (#10754) ... * Fix typo in light theme * Fix background color of empty column	7 years ago
Thibaut Girka	2b97d9d780	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	6dc9baad2a	Change icon and label depending on whether media is marked as sensitive (#10748) ... * Change icon and label depending on whether media is marked as sensitive * WiP use a checkbox	7 years ago
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	7 years ago
ThibG	f2be71c293	Add emoji suggestions to CW and poll option fields (#10555) ... * Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus	7 years ago
Maciek Baron	0402c52f28	Improve poll link accessibility (#10720) ... * Add distinction between hover and active/focus states * Resolves #10198	7 years ago
Jeong Arm	09eea46631	Bring back crossed eye icon on gallery (#10715)	7 years ago
nzws	5c82d660d1	Fix some colors of high contrast theme (#10711) ... * Fix "nothing here" text color of high contrast * Fix counter border color of high contrast	7 years ago
Thibaut Girka	832cf92c74	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Baptiste Gelez	21209c2b52	Make sure the instance banner is never cropped (#10702)	7 years ago
Thibaut Girka	52a4284fe5	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	7aa749ab46	Fix transition: all (#10699)	7 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	7 years ago
Eugen Rochko	63b1388fef	Change font weight of sensitive button to 500 (#10682)	7 years ago
ThibG	011b032300	Provide a link to existing domain block when trying to block an already-blocked domain (#10663) ... * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded	7 years ago
Eugen Rochko	eb63217210	Add button to view context to media modal (#10676) ... * Add "view context" button to media modal when opened from gallery * Add "view context" button to video modal Allow closing the video modal by navigating back in the browser, just like the media modal	7 years ago
Eugen Rochko	05ef3462ba	Make the "mark media as sensitive" button more obvious in web UI (#10673) ... * Make the "mark media as sensitive" button more obvious in web UI * Use eye-slash icon instead of eye icon to mean "hide"	7 years ago
Eugen Rochko	967e419f8f	Fix alignment of items in the account gallery in web UI and load more per page (#10674)	7 years ago
Eugen Rochko	3f143606fa	Change account gallery in web UI (#10667) ... - 3 items per row instead of 2 - Use blurhash for previews - Animate/hover-to-play GIFs and videos - Open media modal instead of opening status - Allow opening status instead with ctrl+click and open in new tab	7 years ago
Eugen Rochko	fba96c808d	Add blurhash (#10630) ... * Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues	7 years ago
Thibaut Girka	a9eaa780f5	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	7 years ago
kedama	d763d39d26	Fix modal items cannot scroll on touch devices (#10605)	7 years ago
ThibG	6e620dcab1	Use correct local names for fonts (#10594)	7 years ago
Thibaut Girka	268417daf3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	7f75792bf3	Allow modal secondary button to shrink and allow wider confirmation modals (#10586) ... Fixes #10531	7 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	7 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	7 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	7 years ago
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a1. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	7 years ago
Thibaut Girka	12dae9d583	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	7 years ago
ThibG	62bafa20a1	Hide blocking accounts from blocked users (#10442) ... * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa * Refactor by adding `without_blocking` scope	7 years ago
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	8fb69f1366	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) ... Fix #10315 This reverts commit db06b25376.	7 years ago
Eugen Rochko	79227d153b	Fix transparent avatars showing underlying elements in avatar stack and profile (#10422)	7 years ago
Eugen Rochko	bd02ec6daa	Add indication that you have been blocked in web UI (#10420)	7 years ago
Thibaut Girka	ce7d055d3c	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	58667072d9	Fix opacity of relationship tags (#10411)	7 years ago
Alex Gessner	69141dca26	squashed identity proof updates (#10375)	7 years ago
Thibaut Girka	3a2f646cb1	Revert "fix: update to emoji-mart 2.10.0 (#10281)" ... This reverts commit db06b25376.	7 years ago
Thibaut Girka	497a958297	Revert "Fix compilation after emoji-picker change" ... This reverts commit 8ea344fed4.	7 years ago