mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	ec49aa8175	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.	5 years ago
Eugen Rochko	a69ca29473	Change how missing desktop notifications permission is displayed (#14985 ) Add missing controls for new notification type	5 years ago
OSAMU SATO	96761752ec	Add duration parameter to muting. (#13831 ) * Adding duration to muting. * Remove useless checks	5 years ago
ThibG	f54ca3d08e	Fix browser notification permission request logic (#13543 ) * Add notification permission handling code * Request notification permission when enabling any notification setting * Add badge to notification settings when permissions insufficient * Disable alerts by default, requesting permission and enable them on onboarding	5 years ago
Eugen Rochko	a549415868	Fix regressions in icon buttons in web UI (#14915 )	5 years ago
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	5 years ago
Eugen Rochko	d88a79b456	Add pop-out player for audio/video in web UI (#14870 ) Fix #11160	5 years ago
ThibG	ff89025979	Add unread notification markers (#14818 ) * Add unread notification markers Fixes #14804 * Allow IntersectionObserverArticle's children to be updated	5 years ago
Eugen Rochko	974b1b79ce	Add option to be notified when a followed user posts (#13546 ) * Add bell button Fix #4890 * Remove duplicate type from post-deployment migration * Fix legacy class type mappings * Improve query performance with better index * Fix validation * Remove redundant index from notifications	5 years ago
Eugen Rochko	bbcbf12215	Fix unreadable placeholder text color in high contrast theme in web UI (#14803 ) Fix #14717	5 years ago
Thibaut Girka	e5f934ddf0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.	5 years ago
Takeshi Umeda	272aa4a109	Fix direct visibility style for light theme (#14727 )	5 years ago
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	5 years ago
ThibG	79305428a7	Add configuration option to filter replies in lists (#9205 ) * Add database support for list show-reply preferences * Add backend support to read and update list-specific show_replies settings * Add basic UI to set list replies setting * Add specs for list replies policy * Switch "cycling" reply policy link to a set of radio inputs * Capitalize replies_policy strings * Change radio button design to be consistent with that of the directory explorer	5 years ago
Eugen Rochko	1c308af84c	Change own direct-visibility statuses to be in the home feed again (#14711 ) And remove highlighting in web UI Full circle from #8940	5 years ago
Thibaut Girka	8c3c27bf06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.	5 years ago
santiagorodriguez96	e8d41bc2fe	Add WebAuthn as an alternative 2FA method (#14466 ) * feat: add possibility of adding WebAuthn security keys to use as 2FA This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor to the Settings page for editing the 2FA methods – now it will list the methods that are available to the user (TOTP and WebAuthn) and from there they'll be able to add or remove any of them. Also, it's worth mentioning that for enabling WebAuthn it's required to have TOTP enabled, so the first time that you go to the 2FA Settings page, you'll be asked to set it up. This work was inspired by the one donde by Github in their platform, and despite it could be approached in different ways, we decided to go with this one given that we feel that this gives a great UX. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add request for WebAuthn as second factor at login if enabled This commits adds the feature for using WebAuthn as a second factor for login when enabled. If users have WebAuthn enabled, now a page requesting for the use of a WebAuthn credential for log in will appear, although a link redirecting to the old page for logging in using a two-factor code will also be present. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: add possibility of deleting WebAuthn Credentials Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: disable WebAuthn when an Admin disables 2FA for a user Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * feat: remove ability to disable TOTP leaving only WebAuthn as 2FA Following examples form other platforms like Github, we decided to make Webauthn 2FA secondary to 2FA with TOTP, so that we removed the possibility of removing TOTP authentication only, leaving users with just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA' in order to remove second factor auth. The reason for WebAuthn being secondary to TOPT is that in that way, users will still be able to log in using their code from their phone's application if they don't have their security keys with them – or maybe even lost them. * We had to change a little the flow for setting up TOTP, given that now it's possible to setting up again if you already had TOTP, in order to let users modify their authenticator app – given that now it's not possible for them to disable TOTP and set it up again with another authenticator app. So, basically, now instead of storing the new `otp_secret` in the user, we store it in the session until the process of set up is finished. This was because, as it was before, when users clicked on 'Edit' in the new two-factor methods lists page, but then went back without finishing the flow, their `otp_secret` had been changed therefore invalidating their previous authenticator app, making them unable to log in again using TOTP. Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> * refactor: fix eslint errors The PR build was failing given that linting returning some errors. This commit attempts to fix them. * refactor: normalize i18n translations The build was failing given that i18n translations files were not normalized. This commits fixes that. * refactor: avoid having the webauthn gem locked to a specific version * refactor: use symbols for routes without '/' * refactor: avoid sending webauthn disabled email when 2FA is disabled When an admins disable 2FA for users, we were sending two mails to them, one notifying that 2FA was disabled and the other to notify that WebAuthn was disabled. As the second one is redundant since the first email includes it, we can remove it and send just one email to users. * refactor: avoid creating new env variable for webauthn_origin config * refactor: improve flash error messages for webauthn pages Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>	5 years ago
Tdxdxoz	a3ec9af9b0	Fix: also use custom private boost icon for detailed status (#14471 ) * use custom private boost icon for detail status * only use className	5 years ago
Thibaut Girka	da62e350e0	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	d70c3ab4c3	Add HTML form validation for the registration form (#14560 ) * Add HTML-level validation of username in sign-up form * Make required fields with incorrect values more visible * Enable HTML form validation for the registration form * Mark agreement checkbox as required client-side * Add minimum length to password * Add client-side password confirmation validation	5 years ago
Thibaut Girka	23cd5f2c15	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	3ade834830	Fix disabled boost icon being replaced by private boost icon on hover (#14456 ) Fixes #14455	5 years ago
Thibaut Girka	2cfa142961	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.	5 years ago
ThibG	753ba9fc23	Fix hover and normal colors for private boost icon being swapped (#14386 )	5 years ago
Thibaut Girka	4d950c71e9	Merge branch 'master' into glitch-soc/master	5 years ago
ThibG	956473142c	Add custom icon for private boosts (#14380 )	5 years ago
Thibaut Girka	c03d1a9ac8	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	e93efc0309	Change disabled retweet icon (#14373 ) * Change disabled retweet icon * Hide fontawesome version of boost icon in both reduce-motion and no-reduce-motion	5 years ago
Thibaut Girka	b9f351d845	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.	5 years ago
ThibG	85bc0f9639	Fix audio player controls color in mastodon-light theme (#14338 ) Fixes #14337 The new audio player sets the background and foreground colors automatically based on the thumbnail of the audio file, but the mastodon-light theme overrides the controls' colors with a hardcoded color, which sometimes make them unreadable.	5 years ago
Thibaut Girka	e9ad99bc93	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.	5 years ago
Sasha Sorokin	1c903c7ad6	Fix account note border radius (#14251 )	5 years ago
Eugen Rochko	06fc6a9cd4	Add ability to choose media thumbnail in web UI (#14244 )	5 years ago
Eugen Rochko	c3187411c2	Change design of account notes in web UI (#14208 ) * Change design of account notes in web UI * Fix `for` -> `htmlFor`	5 years ago
Thibaut Girka	2d8be0a6e1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.	5 years ago
Eugen Rochko	99f3a55540	Add color extraction for audio thumbnails (#14209 )	5 years ago
Thibaut Girka	45deca65b3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.	5 years ago
Ariel	e9ea960773	Fix cursor type in statuses (#14185 )	5 years ago
ThibG	4babf5b8b5	Fix lock icon not being shown when locking account in profile settings (#14190 )	5 years ago
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

1 2 3 4 5 ...

1092 Commits (ec49aa81753ac71fa26b2ee86448fa5b481d49e4)