511edccf61 
								
							 
						 
						
							
							
								
								[Glitch] Add user notes on accounts  
							
							... 
							
							
							
							Port 65506bac3f 
							
						 
						
							2020-06-30 23:32:02 +02:00  
				
					
						
							
							
								 
						
							
								50f5254568 
								
							 
						 
						
							
							
								
								[Glitch] Fix padding on account header  
							
							... 
							
							
							
							Port d1c6dd2d27 
							
						 
						
							2020-06-30 23:10:44 +02:00  
				
					
						
							
							
								 
						
							
								befe8c72dd 
								
							 
						 
						
							
							
								
								[Glitch] Fix read marker state not being udpated internally  
							
							... 
							
							
							
							Port fa4876a1b9 
							
						 
						
							2020-06-30 23:09:39 +02:00  
				
					
						
							
							
								 
						
							
								934bacd05f 
								
							 
						 
						
							
							
								
								[Glitch] Change sensitive preview cards to not blur text  
							
							... 
							
							
							
							Port a1ad2ad951 
							
						 
						
							2020-06-30 23:08:24 +02:00  
				
					
						
							
							
								 
						
							
								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. 
							
						 
						
							2020-06-30 23:00:20 +02:00  
				
					
						
							
							
								 
						
							
								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” 
							
						 
						
							2020-06-30 19:19:50 +02:00  
				
					
						
							
							
								 
						
							
								5e8f51b29f 
								
							 
						 
						
							
							
								
								Replace to testing-library from enzyme ( #14152 )  
							
							
							
						 
						
							2020-06-29 13:58:07 +02:00  
				
					
						
							
							
								 
						
							
								d1c6dd2d27 
								
							 
						 
						
							
							
								
								Fix padding on account header ( #14179 )  
							
							
							
						 
						
							2020-06-29 13:57:44 +02:00  
				
					
						
							
							
								 
						
							
								64aac30733 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								fa4876a1b9 
								
							 
						 
						
							
							
								
								Fix read marker state not being udpated internally ( #14155 )  
							
							... 
							
							
							
							Fixes  #14151  
						
							2020-06-28 20:55:32 +02:00  
				
					
						
							
							
								 
						
							
								a1ad2ad951 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								de735286cd 
								
							 
						 
						
							
							
								
								Fix public page CSS to match upstream's changes  
							
							... 
							
							
							
							Kind of a port of 418f0a33e9 
							
						 
						
							2020-06-26 13:45:40 +02:00  
				
					
						
							
							
								 
						
							
								4964490bbd 
								
							 
						 
						
							
							
								
								[Glitch] Improve appearence consistency of settings pages  
							
							... 
							
							
							
							Port 08cf81f8c1 
							
						 
						
							2020-06-26 13:31:17 +02:00  
				
					
						
							
							
								 
						
							
								327f6309e4 
								
							 
						 
						
							
							
								
								[Glitch] Fix design issues with sensitive preview cards  
							
							... 
							
							
							
							Port 1d2b0d2121 
							
						 
						
							2020-06-26 13:28:52 +02:00  
				
					
						
							
							
								 
						
							
								9a26d2e127 
								
							 
						 
						
							
							
								
								[Glitch] Fix avatar size in public page detailed status  
							
							... 
							
							
							
							Port 0a56a4a1bc 
							
						 
						
							2020-06-26 13:27:39 +02:00  
				
					
						
							
							
								 
						
							
								2bb25c7730 
								
							 
						 
						
							
							
								
								[Glitch] Fix various issues around OpenGraph representation of media  
							
							... 
							
							
							
							Port front-end changes (except for audio player) from 662a49dc3f 
							
						 
						
							2020-06-26 13:23:56 +02:00  
				
					
						
							
							
								 
						
							
								a01674fb2b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-06-26 13:02:14 +02:00  
				
					
						
							
							
								 
						
							
								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 
							
						 
						
							2020-06-26 00:36:30 +02:00  
				
					
						
							
							
								 
						
							
								e49bd93211 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								f7bdfec5bb 
								
							 
						 
						
							
							
								
								Change to correct the role of the boost button ( #14132 )  
							
							
							
						 
						
							2020-06-25 22:44:19 +02:00  
				
					
						
							
							
								 
						
							
								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 
							
						 
						
							2020-06-25 22:43:59 +02:00  
				
					
						
							
							
								 
						
							
								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 
							
						 
						
							2020-06-25 22:42:01 +02:00  
				
					
						
							
							
								 
						
							
								0a56a4a1bc 
								
							 
						 
						
							
							
								
								Fix avatar size in public page detailed status ( #14140 )  
							
							... 
							
							
							
							Regression from the inline-CSS changes 
							
						 
						
							2020-06-25 22:41:12 +02:00  
				
					
						
							
							
								 
						
							
								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 
							
						 
						
							2020-06-25 01:33:01 +02:00  
				
					
						
							
							
								 
						
							
								72d193654b 
								
							 
						 
						
							
							
								
								[Glitch] Fix very wide media attachments resulting in too thin a thumbnail  
							
							... 
							
							
							
							Port d469247083 
							
						 
						
							2020-06-24 16:01:28 +02:00  
				
					
						
							
							
								 
						
							
								83bc9f68af 
								
							 
						 
						
							
							
								
								[Glitch] Fix modifier key to keep the EmojiPicker on macOS  
							
							... 
							
							
							
							Port 434a6d0b15 
							
						 
						
							2020-06-24 15:56:43 +02:00  
				
					
						
							
							
								 
						
							
								51922d7ffa 
								
							 
						 
						
							
							
								
								[Glitch] Fix unnecessary gap under of video modal  
							
							... 
							
							
							
							Port cb3c6d1780 
							
						 
						
							2020-06-24 15:55:53 +02:00  
				
					
						
							
							
								 
						
							
								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. 
							
						 
						
							2020-06-24 15:33:41 +02:00  
				
					
						
							
							
								 
						
							
								bb9ca8a587 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								d469247083 
								
							 
						 
						
							
							
								
								Fix very wide media attachments resulting in too thin a thumbnail ( #14127 )  
							
							... 
							
							
							
							Fixes  #14094  
						
							2020-06-23 17:24:29 +02:00  
				
					
						
							
							
								 
						
							
								5d12b63e79 
								
							 
						 
						
							
							
								
								Simplify filtering condition  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00  
				
					
						
							
							
								 
						
							
								c1377049c6 
								
							 
						 
						
							
							
								
								never filter own posts from timeline  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00  
				
					
						
							
							
								 
						
							
								791402af7c 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								419ad6248b 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								aaf91abffa 
								
							 
						 
						
							
							
								
								Fix audio player not working when media files are hosted on a different domain ( #14118 )  
							
							
							
						 
						
							2020-06-22 19:24:16 +02:00  
				
					
						
							
							
								 
						
							
								75a2b8f815 
								
							 
						 
						
							
							
								
								Change design of audio players in web UI ( #14095 )  
							
							
							
						 
						
							2020-06-21 02:27:19 +02:00  
				
					
						
							
							
								 
						
							
								434a6d0b15 
								
							 
						 
						
							
							
								
								Fix modifier key to keep the EmojiPicker on macOS ( #14096 )  
							
							
							
						 
						
							2020-06-20 13:30:40 +02:00  
				
					
						
							
							
								 
						
							
								cb3c6d1780 
								
							 
						 
						
							
							
								
								Fix unnecessary gap under of video modal ( #14098 )  
							
							
							
						 
						
							2020-06-20 13:30:27 +02:00  
				
					
						
							
							
								 
						
							
								9a641a5a0e 
								
							 
						 
						
							
							
								
								[Glitch] Add hints about incomplete remote content to web UI  
							
							... 
							
							
							
							Port 3e9dc4044b 
							
						 
						
							2020-06-17 17:48:04 +02:00  
				
					
						
							
							
								 
						
							
								65a9b788fc 
								
							 
						 
						
							
							
								
								[Glitch] Fix initial audio volume not corresponding to what's displayed  
							
							... 
							
							
							
							Port 755e8c76ab 
							
						 
						
							2020-06-17 17:20:14 +02:00  
				
					
						
							
							
								 
						
							
								45fbba2742 
								
							 
						 
						
							
							
								
								[Glitch] Fixed emoji detection problem to append border  
							
							... 
							
							
							
							Port b1484cf3ce 
							
						 
						
							2020-06-17 17:18:42 +02:00  
				
					
						
							
							
								 
						
							
								59e92004b3 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								755e8c76ab 
								
							 
						 
						
							
							
								
								Fix initial audio volume not corresponding to what's displayed ( #14057 )  
							
							
							
						 
						
							2020-06-15 16:43:30 +02:00  
				
					
						
							
							
								 
						
							
								3e9dc4044b 
								
							 
						 
						
							
							
								
								Add hints about incomplete remote content to web UI ( #14031 )  
							
							
							
						 
						
							2020-06-14 22:29:40 +02:00  
				
					
						
							
							
								 
						
							
								b1484cf3ce 
								
							 
						 
						
							
							
								
								Fixed emoji detection problem to append border ( #14020 )  
							
							... 
							
							
							
							* Fixed emoji detection problem to append border
* Add tests
* Add missing semicolon
* Fixed wrong result when includes different variation selector
* Add missing semicolon
* Remove grapheme-splitter and Change emoji list to array from string
* Update comment
* Remove spaces
Co-authored-by: ThibG <thib@sitedethib.com> 
							
						 
						
							2020-06-10 21:56:14 +02:00  
				
					
						
							
							
								 
						
							
								c813789e06 
								
							 
						 
						
							
							
								
								Fix TL sometimes jumping when closing modals ( #14019 )  
							
							... 
							
							
							
							Fixes  #14018  
						
							2020-06-10 13:57:13 +02:00  
				
					
						
							
							
								 
						
							
								b9d75e49c2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-06-10 12:10:26 +02:00  
				
					
						
							
							
								 
						
							
								cc6b8a9615 
								
							 
						 
						
							
							
								
								Fix WebUI crash when processing accounts before page is loaded ( #14015 )  
							
							
							
						 
						
							2020-06-09 20:53:20 +02:00  
				
					
						
							
							
								 
						
							
								e9d7ca7645 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI crash when loading account data before page is loaded  
							
							
							
						 
						
							2020-06-09 11:55:07 +02:00  
				
					
						
							
							
								 
						
							
								00cd919750 
								
							 
						 
						
							
							
								
								[Glitch] Add hotkey for toggling content warning composer field  
							
							... 
							
							
							
							Port 6b6a9d0ea3 
							
						 
						
							2020-06-09 11:14:20 +02:00