mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	9c3b9d5ab9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.	5 years ago
ThibG	65506bac3f	Add user notes on accounts (#14148 ) * Add UserNote model * Add UI for user notes * Put comment in relationships entity * Add API to create user notes * Copy user notes to new account when receiving a Move activity * Address some of the review remarks * Replace modal by inline edition * Please CodeClimate * Button design changes * Change design again * Cancel note edition when pressing Escape * Fixes * Tweak design again * Move “Add note” item, and allow users to add notes to themselves * Rename UserNote into AccountNote, rename “comment” Relationship attribute to “note”	5 years ago
trwnh	d1c6dd2d27	Fix padding on account header (#14179 )	5 years ago
ThibG	a1ad2ad951	Change sensitive preview cards to not blur text (#14143 ) Also only require click-through for interactive embeds.	5 years ago
Thibaut Girka	a01674fb2b	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Mélanie Chauvel	08cf81f8c1	Improve appearence consistency of settings pages (#13938 ) * Fix header button changing header size in settings pages * Make form buttons look more like a part of the form in settings pages - Put buttons closer, using same distance as between inputs - Make buton font size a bit smaller to blend a bit more - Add the class button to button tags for consisent styling	5 years ago
Takeshi Umeda	418f0a33e9	Add a visibility icon to status (#14123 ) * Add a visibility icon to status * Change to using the icon element * Fix RTL * Add a public globe	5 years ago
ThibG	1d2b0d2121	Fix design issues with sensitive preview cards (#14126 ) * Fix design issues with sensitive preview cards * Center “sensitive” label on preview image for interactive cards * Add “button” role to sensitive preview card text	5 years ago
ThibG	0a56a4a1bc	Fix avatar size in public page detailed status (#14140 ) Regression from the inline-CSS changes	5 years ago
Eugen Rochko	662a49dc3f	Fix various issues around OpenGraph representation of media (#14133 ) - Fix audio attachments not being represented in OpenGraph tags - Fix audio being represented as "1 image" in OpenGraph descriptions - Fix video metadata being overwritten by paperclip-av-transcoder - Fix embedded player not using Mastodon's UI - Fix audio/video progress bars not moving smoothly - Fix audio/video buffered bars not displaying correctly	5 years ago
Thibaut Girka	aae60a2366	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.	5 years ago
Eugen Rochko	bb9ca8a587	Fix audio/video/images/cards not reacting to window resizes in web UI (#14130 ) * Fix audio/video/images/cards not reacting to window resizes in web UI * Update app/javascript/mastodon/features/audio/index.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	5 years ago
ThibG	d469247083	Fix very wide media attachments resulting in too thin a thumbnail (#14127 ) Fixes #14094	5 years ago
Eugen Rochko	419ad6248b	Change volume control and download buttons in web UI (#14122 ) * Fix audio download button not starting download in web UI * Fix volume controls on audio and video players in web UI * Remove download button from video player in web UI	5 years ago
Eugen Rochko	75a2b8f815	Change design of audio players in web UI (#14095 )	5 years ago
fuyu	cb3c6d1780	Fix unnecessary gap under of video modal (#14098 )	5 years ago
Thibaut Girka	59e92004b3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency	5 years ago
Eugen Rochko	3e9dc4044b	Add hints about incomplete remote content to web UI (#14031 )	5 years ago
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	5 years ago
ThibG	db319c0fdc	Improve rendering of emoji which do not contrast with background (#13772 ) * Refactor list of emoji requiring added outlines so that it can be theme-specific * Split inaccessible emoji to emoji requiring an outline and ones that can be inverted * Drop the “silouhettes” from black emoji as they seem to have changed color * Add inaccessible emojis list for the light theme * Use bordered emoji variant instead of unreliable CSS	5 years ago
ThibG	8e96510b25	Hide sensitive preview cards with blurhash (#13985 ) * Use preview card blurhash in WebUI * Handle sensitive preview cards	5 years ago
Thibaut Girka	89de02f7aa	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Christopher Choi	b4a8400afd	Adjust flash alert contrast for better readability (#13892 )	5 years ago
Thibaut Girka	f94aebafe5	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	c9dcc2d39f	Fix regression in sparkline style in web UI (#13753 )	5 years ago
Thibaut Girka	3baacf6993	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	48503384d0	Fix some account avatars on public pages having incorrect size (#13692 ) * Fix some account avatars on public pages having incorrect size * Remove outdated and overridden width and height attributes * Remove more hardcoded width/height attributes	5 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	5 years ago
ThibG	c0b849bdfd	Fix use of inline CSS in public pages (#13576 ) Change `account_link_to` to use an image tag rather than some inline CSS. Dropped the `size` parameter in the process, but it wasn't used for anything except the default value of 36px. Dropped CSS rules that were always overriden, and defaulted to 36px width and height instead.	5 years ago
Thibaut Girka	a22e6a3683	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	5 years ago
ThibG	b8ba977497	Fix admin-facing uses of inline CSS (#13575 ) * Move .back-button inline styles to CSS file All occurrences of the back-button CSS class used the same inline CSS rules, so moved them over to the CSS file * Fix “Add new domain block” button using inline CSS * Replace common pattern of inline-styled button boxes by a CSS class In particular, switching from `float: left/right` to a flexbox with `justify-content: space-between`. This implied changing the order of a few HTML tags and adding an empty `div` in one case. Also removed a `margin-bottom` rule that wasn't needed due to the margins of surrounding elements. * Move account admin view inline CSS to CSS file	5 years ago
ThibG	0e362b7678	Fix end-user-facing uses of inline CSS (#13438 ) * Move some inline styles to CSS files * Move default_account_display_name span to fix useless tags with duplicate id * Change handling of public pages spoiler text from inline CSS to dataset attribute * Use the `dir` HTML attribute instead of inline CSS * Move status action bar inline CSS to CSS file * Hide logo resources from CSS file, not inline CSS Fixes #11601 * Move translation prompt styling from inline CSS to CSS file * Move “invited by” styling on registration form from inline to CSS file * Use the progress tag to display poll results in JS fallback * Fix poll results JS-less fallback when the user has voted for an option * Change account public page “moved” notice to use img tags instead of inline CSS * Move OTP hint inline CSS to SCSS file * Hide JS-less fallback vote progressbars from accessibility tools Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	5 years ago
ThibG	04eb599864	Fix messed up z-index when NoScript blocks media/previews (#13449 ) Fixes #13444	5 years ago
Thibaut Girka	8b2823b7b6	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Irie Aoi	c5c8f68031	Set max-width and max-height to gif video (#13533 )	5 years ago
Thibaut Girka	8fef96cbf5	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	d3ff06a320	Add explanation as to why unlocked accounts may have follow requests (#13385 ) * Add explanation as to why unlocked accounts may have follow requests * Change wording to avoid “silenced”	5 years ago
Eugen Rochko	f65568f1d4	Add ability to filter audit log in admin UI (#13381 )	5 years ago
Thibaut Girka	f3eff922a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	5 years ago
Sasha Sorokin	37b3985bfa	Improve polls: option lengths & redesign (#13257 ) This commit redesign the polls and increases characters limit for the options from 25 to 50 characters, giving pollsters more freedom. Summarizing, the redesign is making the polls more adaptive for upcoming changes to the options characters limit: the bar, or a "chart", is now displayed separately from the option itself; vote check mark is moved next to the option text, making the percentages take less space. Option lengths are taken into account and text is wrapped to multiple lines if necessary to avoid overflow.	5 years ago
Mélanie Chauvel (ariasuni)	1fb92037e4	Improve toot clicking areas (#13327 ) * Make the area to the left “Show Thread” also expand the toot in Web UI * Clicking the left part of a conversation with the avatars now opens it in Web UI	5 years ago
Mélanie Chauvel (ariasuni)	be2f1597cf	Fix wrong color for ellipsis in boost confirmation dialog in Web UI (#13355 )	5 years ago
Thibaut Girka	7b435fd9bf	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.	5 years ago
ThibG	beb80adb51	Change poll option hover/active styling to be less confusing (#13313 )	5 years ago
Thibaut Girka	c790ecb14d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	5 years ago
Mélanie Chauvel (ariasuni)	2e18b1a2a2	Fix text area above/right of emoji picker being accidentally clickable in web UI (#13148 )	5 years ago
ThibG	503eab1c1f	Fix too large announcements not being scrollable in web UI (#13211 )	5 years ago
koyu	e69a3f54a1	Change GIF label to be displayed even when autoplay is enabled in web UI (#13209 )	5 years ago
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	5 years ago
Eugen Rochko	90f04ea064	Fix unread indicator on announcements not being aligned with text in web UI (#13052 )	5 years ago

1 2 3 4 5 ...

1053 Commits (befe8c72ddd3b427ccf1489a6de6bcc23b6a55f5)