1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 23:24:55 +01:00
Commit Graph

4496 Commits

Author SHA1 Message Date
ThibG
572d1a1bf8 [Glitch] Fix home TL marker code mishandling gaps
Port eaea2311aa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 15:00:19 +02:00
ThibG
4586202448 [Glitch] Fix notification filter bar incorrectly filtering gaps
Port aab867b0e8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 14:59:10 +02:00
ThibG
d31792a2a6 [Glitch] Add border around 🕺 emoji
Port 91eecd1b3c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-28 14:58:25 +02:00
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.
2020-09-28 14:13:30 +02:00
Eugen Rochko
d88a79b456
Add pop-out player for audio/video in web UI ()
Fix 
2020-09-28 13:29:43 +02:00
ThibG
ff89025979
Add unread notification markers ()
* Add unread notification markers

Fixes 

* Allow IntersectionObserverArticle's children to be updated
2020-09-26 20:57:07 +02:00
Thibaut Girka
787d5d7289 Fix minor bugs 2020-09-19 15:01:46 +02:00
Thibaut Girka
312c936d51 Minor refactoring and fixups 2020-09-19 14:15:28 +02:00
Thibaut Girka
85b9086e6b Filter out mounted lists from “getting started” column 2020-09-18 20:07:25 +02:00
Eugen Rochko
974b1b79ce
Add option to be notified when a followed user posts ()
* Add bell button

Fix 

* 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
2020-09-18 17:26:45 +02:00
Thibaut Girka
a681980307 Submit timeline markers closer to the moment they change 2020-09-17 15:22:56 +02:00
Thibaut Girka
60eebc6cc4 Fix crashes when connection drops 2020-09-17 15:22:56 +02:00
Thibaut Girka
f1c0cf9806 Add button to manually mark all notifications as read 2020-09-17 15:22:56 +02:00
Thibaut Girka
94c290d7d2 Only update read marker when giving focus/mounting column 2020-09-17 15:22:56 +02:00
Thibaut Girka
145ed37978 Refactor and change logic to only update marker if we reached the last
read notification.
2020-09-17 15:22:56 +02:00
Thibaut Girka
66e9a77e36 Display unread marker for notifications 2020-09-17 15:22:56 +02:00
Thibaut Girka
ae698469d0 Clean up leftover from DM conversation view redesign 2020-09-17 15:22:56 +02:00
ThibG
eaea2311aa
Fix home TL marker code mishandling gaps () 2020-09-16 20:17:40 +02:00
ThibG
aab867b0e8
Fix notification filter bar incorrectly filtering gaps () 2020-09-16 20:17:16 +02:00
Eugen Rochko
bbcbf12215
Fix unreadable placeholder text color in high contrast theme in web UI ()
Fix 
2020-09-15 09:24:24 +02:00
ThibG
b67caf9be4
Add paragraph about browser add-ons when encountering some errors ()
* Add paragraph about browser add-ons when encountering some errors

When a crash is caused by a NotFoundError exception, add a paragraph
to the error page mentioning browser add-ons.

Indeed, crashes with NotFoundError are often caused by browser extensions
messing with the DOM in ways React.JS can't recover from (e.g. issues 
and ).

* Reword error messages
2020-09-14 15:05:22 +02:00
ThibG
91eecd1b3c
Add border around 🕺 emoji ()
Fixes 
2020-09-10 19:08:03 +02:00
kedama
afa753a890 [Glitch] Set z-index of dropdown to 9999.
Port 678f5ed296 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-10 17:44:38 +02:00
Eugen Rochko
fcb9350ff8
Change web UI to show empty profile for suspended accounts () 2020-09-10 00:07:19 +02:00
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.
2020-09-07 09:21:38 +02:00
Eugen Rochko
a6121a159c
Remove obsolete IndexedDB operations from web UI ()
Storing objects in IndexedDB was disabled in , but we were
still trying to read objects from it before making an API call
2020-09-04 20:22:40 +02:00
Takeshi Umeda
272aa4a109
Fix direct visibility style for light theme () 2020-09-04 08:49:56 +02:00
ThibG
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
ThibG
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
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.
2020-09-01 17:02:18 +02:00
Thibaut Girka
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
Thibaut Girka
70e64206be Capitalize replies_policy strings
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-09-01 14:09:35 +02:00
ThibG
79305428a7
Add configuration option to filter replies in lists ()
* 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
Eugen Rochko
1c308af84c
Change own direct-visibility statuses to be in the home feed again ()
And remove highlighting in web UI

Full circle from 
2020-09-01 13:30:42 +02:00
Thibaut Girka
e02f375d22 Fix threaded mode
Fixes 
2020-09-01 09:37:17 +02:00
ThibG
5fc5a9f9f1
Update Tesseract.js ()
* [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
Thibaut Girka
38182fceb3 Fix crash when opening detailed view of a status you boosted 2020-08-31 23:48:16 +02:00
ThibG
f0b6ddd979
Add border around 🐞 emoji () 2020-08-31 23:30:27 +02:00
ThibG
7febf19296
Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted ()
* 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
Thibaut Girka
a68ec50e4e Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
santiagorodriguez96
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
Tdxdxoz
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
Daigo 3 Dango
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
proxy
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
Takeshi Umeda
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
ThibG
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
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.
2020-08-30 16:13:08 +02:00
Thibaut Girka
30632adf9e Fix replying to some remote toots switching to local-only 2020-08-29 19:57:32 +02:00
Thibaut Girka
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
santiagorodriguez96
e8d41bc2fe
Add WebAuthn as an alternative 2FA method ()
* 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