98aa197c07
[Glitch] Fix cursor type in statuses
...
Port eee8b314af
2020-07-01 20:18:07 +02:00
0f633143eb
[Glitch] Fix lock icon not being shown when locking account in profile settings
...
Port 9e14647df8
2020-07-01 20:13:51 +02:00
928a3a9fd5
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.
2020-07-01 19:23:14 +02:00
eee8b314af
Fix cursor type in statuses ( #14185 )
2020-07-01 13:52:05 +02:00
9e14647df8
Fix lock icon not being shown when locking account in profile settings ( #14190 )
2020-07-01 13:51:50 +02:00
4b703d398a
follow-up #14149 ( #14192 )
...
ran `yarn manage:translations en`
2020-07-01 11:34:19 +02:00
50f439db96
[Glitch] Add user notes on accounts
...
Port 3afc7977b1
2020-06-30 23:32:02 +02:00
9dcd3388f6
[Glitch] Fix padding on account header
...
Port 41acf83cdf
2020-06-30 23:10:44 +02:00
a11fac77f3
[Glitch] Fix read marker state not being udpated internally
...
Port 8b7066dc61
2020-06-30 23:09:39 +02:00
1c3764c6f8
[Glitch] Change sensitive preview cards to not blur text
...
Port c92278aa1c
2020-06-30 23:08:24 +02:00
2a2af880b8
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.
2020-06-30 23:00:20 +02:00
3afc7977b1
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”
2020-06-30 19:19:50 +02:00
72ff9a1d65
Replace to testing-library from enzyme ( #14152 )
2020-06-29 13:58:07 +02:00
41acf83cdf
Fix padding on account header ( #14179 )
2020-06-29 13:57:44 +02:00
a3ce01a102
Add customizable thumbnails for audio and video attachments ( #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
2020-06-29 13:56:55 +02:00
8b7066dc61
Fix read marker state not being udpated internally ( #14155 )
...
Fixes #14151
2020-06-28 20:55:32 +02:00
c92278aa1c
Change sensitive preview cards to not blur text ( #14143 )
...
Also only require click-through for interactive embeds.
2020-06-26 14:31:13 +02:00
5ea65bfe13
Fix public page CSS to match upstream's changes
...
Kind of a port of 1aed75c2d0
2020-06-26 13:45:40 +02:00
2700043e34
[Glitch] Improve appearence consistency of settings pages
...
Port 2fca9d3715
2020-06-26 13:31:17 +02:00
00283fe6ab
[Glitch] Fix design issues with sensitive preview cards
...
Port 907fe2996c
2020-06-26 13:28:52 +02:00
4500435bb1
[Glitch] Fix avatar size in public page detailed status
...
Port 528c103fc6
2020-06-26 13:27:39 +02:00
03273b3c7b
[Glitch] Fix various issues around OpenGraph representation of media
...
Port front-end changes (except for audio player) from 12ac904a33
2020-06-26 13:23:56 +02:00
0e33582bff
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-26 13:02:14 +02:00
2fca9d3715
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
2020-06-26 00:36:30 +02:00
cb63e1e0d7
Improve wording of the “Add media” button tooltip ( #13954 )
...
- Remove (incomplete) list of supported formats
- List types of media (image, video, audio)
- Tell that several images could be uploaded using plural
2020-06-26 00:14:29 +02:00
17c1443b23
Change to correct the role of the boost button ( #14132 )
2020-06-25 22:44:19 +02:00
1aed75c2d0
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
2020-06-25 22:43:59 +02:00
907fe2996c
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
2020-06-25 22:42:01 +02:00
528c103fc6
Fix avatar size in public page detailed status ( #14140 )
...
Regression from the inline-CSS changes
2020-06-25 22:41:12 +02:00
12ac904a33
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
2020-06-25 01:33:01 +02:00
c0ad588857
[Glitch] Fix very wide media attachments resulting in too thin a thumbnail
...
Port 90445230cd
2020-06-24 16:01:28 +02:00
26778b8c30
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
...
Port c0b52ac871
2020-06-24 15:56:43 +02:00
2e48c4ae55
[Glitch] Fix unnecessary gap under of video modal
...
Port 88cbcb5804
2020-06-24 15:55:53 +02:00
c1eb60642b
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.
2020-06-24 15:33:41 +02:00
d0dc37eadb
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>
2020-06-24 10:25:32 +02:00
90445230cd
Fix very wide media attachments resulting in too thin a thumbnail ( #14127 )
...
Fixes #14094
2020-06-23 17:24:29 +02:00
a6ce37528e
Simplify filtering condition
2020-06-23 16:09:36 +02:00
3489cb87b7
never filter own posts from timeline
2020-06-23 16:09:36 +02:00
6c42b23382
never filter own posts from timeline ( #14128 )
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Co-authored-by: ash lea <example@thisismyactual.email>
2020-06-23 16:01:34 +02:00
ce34c13aff
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
2020-06-23 12:20:14 +02:00
90477d7e4d
Fix audio player not working when media files are hosted on a different domain ( #14118 )
2020-06-22 19:24:16 +02:00
563a77d0b4
Change design of audio players in web UI ( #14095 )
2020-06-21 02:27:19 +02:00
c0b52ac871
Fix modifier key to keep the EmojiPicker on macOS ( #14096 )
2020-06-20 13:30:40 +02:00
88cbcb5804
Fix unnecessary gap under of video modal ( #14098 )
2020-06-20 13:30:27 +02:00
aeba0f513d
[Glitch] Add hints about incomplete remote content to web UI
...
Port 32b7d341b7
2020-06-17 17:48:04 +02:00
743cef53d8
[Glitch] Fix initial audio volume not corresponding to what's displayed
...
Port 3f5fa64211
2020-06-17 17:20:14 +02:00
14272c3a0e
[Glitch] Fixed emoji detection problem to append border
...
Port 4a3af0386b
2020-06-17 17:18:42 +02:00
4d5ff62de5
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
2020-06-17 17:10:15 +02:00
3f5fa64211
Fix initial audio volume not corresponding to what's displayed ( #14057 )
2020-06-15 16:43:30 +02:00
32b7d341b7
Add hints about incomplete remote content to web UI ( #14031 )
2020-06-14 22:29:40 +02:00
Ariel