Commit Graph

4620 Commits

Author SHA1 Message Date
272aa4a109 Fix direct visibility style for light theme (#14727) 2020-09-04 08:49:56 +02:00
787a629b8f [Glitch] Update Tesseract.js
Port 5fc5a9f9f1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 17:10:20 +02:00
a2d66a90e6 [Glitch] Add border around 🐞 emoji
Port JS change from f0b6ddd979 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 17:08:09 +02:00
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.
2020-09-01 17:02:18 +02:00
d95dd3883e Change radio button design to be consistent with that of the directory explorer
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
70e64206be Capitalize replies_policy strings
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
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
2020-09-01 13:31:28 +02:00
1c308af84c Change own direct-visibility statuses to be in the home feed again (#14711)
And remove highlighting in web UI

Full circle from #8940
2020-09-01 13:30:42 +02:00
e02f375d22 Fix threaded mode
Fixes #1414
2020-09-01 09:37:17 +02:00
5fc5a9f9f1 Update Tesseract.js (#14708)
* [WiP] Update Tesseract.js

- Update Tesseract.js to 2.2.1
- Use versioned file names
- differentiate two progression states: preparing OCR and detecting picture

* Get rid of copy-webpack-plugin
2020-09-01 00:26:10 +02:00
38182fceb3 Fix crash when opening detailed view of a status you boosted 2020-08-31 23:48:16 +02:00
f0b6ddd979 Add border around 🐞 emoji (#14712) 2020-08-31 23:30:27 +02:00
7febf19296 Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted (#14707)
* Add back "Home" link to "Getting started" when Home column isn't mounted

* Fix keys in getting_started

It should not matter much in practice as the list of items will only
change extremely rarely, but having a `key` that corresponds to the actual
item makes much more sense than having it be the index of the item within
the list.
2020-08-31 18:11:37 +02:00
a68ec50e4e Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
a340e653df [Glitch] Add WebAuthn as an alternative 2FA method
Port CSS changes from e8d41bc2fe

Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 17:21:16 +02:00
bf55b5463a [Glitch] Fix: also use custom private boost icon for detailed status
Port a3ec9af9b0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:51:16 +02:00
72b1d5fdc5 [Glitch] Better manage subscriptionCounters
Port 9669557be1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:35:33 +02:00
3bbf6b1519 [Glitch] reword "boost to original audience" as per tootsuite#14596
Port 46210a65d1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:34:38 +02:00
cd806663af [Glitch] Fix click range discrepancies in gifv
Port debf6ae316 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:31:41 +02:00
45d1f34a30 [Glitch] Fix scrolling issues when closing some dropdown menus
Port c7cfd4e67a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-30 16:31:02 +02:00
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.
2020-08-30 16:13:08 +02:00
30632adf9e Fix replying to some remote toots switching to local-only 2020-08-29 19:57:32 +02:00
f1d31cf18d Fix spacing around reblog counter in detailed statuses
And bring the whole thing closer to upstream's code.
2020-08-24 20:03:37 +02:00
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>
2020-08-24 16:46:27 +02:00
a3ec9af9b0 Fix: also use custom private boost icon for detailed status (#14471)
* use custom private boost icon for detail status

* only use className
2020-08-24 14:13:44 +02:00
9669557be1 Better manage subscriptionCounters (#14608)
Before this change:
- unsubscribe() was not called for a disconnection
- It seems that WebSocketClient calls connected() and reconnected().
  subscriptionCounters were incremented twice for a single reconnection,
  first from connected() and second from reconnected()

This might be a an additional change to
https://github.com/tootsuite/mastodon/pull/14579
to recover subscriptions after a reconnect.
2020-08-24 14:06:45 +02:00
46210a65d1 reword "boost to original audience" as per #14596 (#14598) 2020-08-23 00:08:31 +02:00
debf6ae316 Fix click range discrepancies in gifv (#14615) 2020-08-23 00:08:12 +02:00
c7cfd4e67a Fix scrolling issues when closing some dropdown menus (#14606) 2020-08-21 14:14:28 +02:00
5dcc406abe Change styling to always have scrollbar on search results 2020-08-17 15:46:18 +02:00
d4b65193c7 Fix WebUI crash in edge case when media display size causes scroll
Fixes #1406
2020-08-17 15:46:18 +02:00
e5dbdebc31 Fix styling of display names and account handles, make it closer to upstream 2020-08-13 23:32:29 +02:00
0f71372d63 [Glitch] Add client-side validation in password change forms
Port 7dc4c74265 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:26:22 +02:00
b6c0f1fdc6 [Glitch] Add HTML form validation for the registration form
Port d70c3ab4c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:25:33 +02:00
da62e350e0 Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
7dc4c74265 Add client-side validation in password change forms (#14564)
* Fix client-side username validation at registration

It used the Account::USERNAME_RE regexp which is for *remote* users,
local user validation is stricter. Also take into account max username length.

* Add client-side form validation for password change

* Add client-side form validation to dedicated registration form

Previous changes only applied to the /about page, not the dedicated form on
/auth
2020-08-12 12:11:15 +02:00
660188c900 Fix local-only flag not necessarily being preserved on delete & redraft 2020-08-12 00:02:44 +02:00
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
2020-08-11 23:09:13 +02:00
0376b6b92b Fix new audio player when under content warnings 2020-08-11 22:37:51 +02:00
8ae52dc792 [Glitch] Add support for managing multiple stream subscriptions in a single connection
Ported ef057584fd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-11 19:40:35 +02:00
78fa15d08f Merge branch 'master' into glitch-soc/master
Conflicts:
- `streaming/index.js`:
  Upstream entirely refactored it.
  Ported our changes to upstream's refactor. Hopefuly.
2020-08-11 19:19:27 +02:00
ef057584fd Add support for managing multiple stream subscriptions in a single connection (#14524) 2020-08-11 18:24:59 +02:00
5d5b9e2f62 Merge branch 'master' into glitch-soc/merge-upstream 2020-08-08 19:10:40 +02:00
bd3420b139 Fix crash when failing to load emoji picker (#14525)
Fixes #14523
2020-08-08 17:57:56 +02:00
4a4d08f3a0 Fix eslint error (#14521) 2020-08-07 10:40:33 +02:00
a637344e37 Fallback to previous, more approximative hashtag RE on older browsers (#14513)
Fixes #14511
2020-08-05 22:39:14 +02:00
a3806ec6ba [Glitch] Fallback to previous, more approximative hashtag RE on older browsers
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-05 13:43:32 +02:00
8f0e6122a9 [Glitch] Fix audio player on Safari
Port 635b6a0f1a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-02 22:30:51 +02:00
b578d70957 Merge branch 'master' into glitch-soc/merge-upstream 2020-08-02 22:29:17 +02:00
635b6a0f1a Fix audio player on Safari (#14485) 2020-08-02 18:47:09 +02:00