Age | Commit message (Collapse) | Author |
|
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.
|
|
|
|
|
|
|
|
* Change move handler to carry blocks and mutes over
When user A blocks user B and B moves to a new account C, make A block C
accordingly.
Note that it only works if A's instance is aware of the Move, that is,
if B is on A's instance or has followers there.
* Also notify instances with known people blocking you when moving
* Add automatic account notes when blocking/muting an account that had no note
|
|
ran `yarn manage:translations en`
|
|
|
|
Fixes #1367
|
|
|
|
Port 65506bac3f3fe233b5b7b3241020bd74eb5c9259 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d1c6dd2d277fee0cf65b480adc868c69df952622 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fa4876a1b93d4bb62038cca75bd5017fe49b59ae to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a1ad2ad9519fda525858ba5aef86815a6f6385f2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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.
|
|
* 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”
|
|
(#14181)
Regression from #14145
|
|
|
|
|
|
- Change audio files to not be stripped of metadata
- Automatically extract cover art from audio if it exists
- Add `thumbnail` parameter to `POST /api/v1/media`, `POST /api/v2/media` and `PUT /api/v1/media/:id`
- Add `icon` to represent it in attachments in ActivityPub
- Fix `preview_url` containing URL of missing missing image when there is no thumbnail instead of null
- Fix duration of audio not being displayed on public pages until the file is loaded
|
|
Fixes #14151
|
|
Also only require click-through for interactive embeds.
|
|
Kind of a port of 418f0a33e9bcd8a1a2384b426bb3cc59b712ef98 to glitch-soc
|
|
Port 08cf81f8c1b445eba9972214869c376fe6097efb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 1d2b0d2121550bf973e8a334cfa29c6d8749c52c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0a56a4a1bc97aac7c10a70a62361c0edfcb2cc54 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes (except for audio player) from 662a49dc3f06749936cedd7349092bbe622f0bc6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
* 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
|
|
- Remove (incomplete) list of supported formats
- List types of media (image, video, audio)
- Tell that several images could be uploaded using plural
|
|
Thai does not separate words by spaces, so I figured out it should be
in 'reliable characters regexp' that denotes languages that do the same.
Related #13891.
|
|
|
|
* Add a visibility icon to status
* Change to using the icon element
* Fix RTL
* Add a public globe
|
|
* Fix design issues with sensitive preview cards
* Center “sensitive” label on preview image for interactive cards
* Add “button” role to sensitive preview card text
|
|
Regression from the inline-CSS changes
|
|
- 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
|
|
Port d469247083dbbe5d4f09cc9d13a3ebd400e6068e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port cb3c6d17804da67d3c0ff233a9ca1c1902f6926f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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.
|
|
* 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>
|
|
Fixes #14094
|
|
Similarly to #12324, the code is passing an Account object where an id
is expected.
|
|
|
|
|
|
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Co-authored-by: ash lea <example@thisismyactual.email>
|
|
* 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
|
|
domain (#14118)
|
|
|
|
|
|
|