ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								94e09d309c 
								
							 
						 
						
							
							
								
								Merge pull request  #1371  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-07-05 22:55:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								69cddc3909 
								
							 
						 
						
							
							
								
								[Glitch] Add color extraction for audio thumbnails  
							
							... 
							
							
							
							Port 99f3a55540 
							
						 
						
							2020-07-05 20:18:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad73e05f46 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio modals not using blurhash and poster  
							
							... 
							
							
							
							Port 162adf61f2 
							
						 
						
							2020-07-05 20:18:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2d8be0a6e1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information. 
							
						 
						
							2020-07-05 19:35:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								99f3a55540 
								
							 
						 
						
							
							
								
								Add color extraction for audio thumbnails ( #14209 )  
							
							
							
						 
						
							2020-07-05 18:28:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f2ab48b75 
								
							 
						 
						
							
							
								
								Add back a cleaner and leaner .env.production.sample ( #14206 )  
							
							
							
						 
						
							2020-07-03 21:01:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								231802725c 
								
							 
						 
						
							
							
								
								Run bundle exec i18n-tasks normalize ( #14205 )  
							
							
							
						 
						
							2020-07-03 13:27:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e399b9df9 
								
							 
						 
						
							
							
								
								Fix-up  #13749  ( #14204 )  
							
							
							
						 
						
							2020-07-03 13:26:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a80fd8c79b 
								
							 
						 
						
							
							
								
								Change the about.instance_actor_flash to be single-line ( #14200 )  
							
							... 
							
							
							
							Some translations of that string are single-line, which somehow seems to make
Crowdin issue a blank newline at the end of those translations.
This, in turns, leads to different results when running “i18n-tasks normalize”
depending on the version of libyaml installed, making the CI fail if it
runs a different version than whoever ran “i18n-tasks normalize”.
Since there is no real reason for that source string to be multi-line (it is
only displayed in HTML, without replacing newlines by <br/> tags),
attempt to fix Crowdin export by making the source string single-line. 
							
						 
						
							2020-07-03 03:06:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								534da9ba23 
								
							 
						 
						
							
							
								
								Fix audio uploads without embedded image ( #14203 )  
							
							
							
						 
						
							2020-07-03 03:05:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9b3677d509 
								
							 
						 
						
							
							
								
								[Glitch] Add customizable thumbnails for audio and video attachments  
							
							... 
							
							
							
							Port 64aac30733 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8999eea707 
								
							 
						 
						
							
							
								
								[Glitch] Fix various issues around OpenGraph representation of media  
							
							... 
							
							
							
							Port audio player changes from 662a49dc3f 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e6dc2fd8eb 
								
							 
						 
						
							
							
								
								Revert "Revert "Remove unused dependency on wavesurfer.js ( #14136 )""  
							
							... 
							
							
							
							This reverts commit dc99608bcf 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								06309129be 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI  
							
							... 
							
							
							
							Port bb9ca8a587 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1c58420831 
								
							 
						 
						
							
							
								
								[Glitch] Change volume control and download buttons in web UI  
							
							... 
							
							
							
							Port 419ad6248b 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1ad79d11f3 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio player not working when media files are hosted on a different domain  
							
							... 
							
							
							
							Port aaf91abffa 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad978ab1d4 
								
							 
						 
						
							
							
								
								[Glitch] Change design of audio players in web UI  
							
							... 
							
							
							
							Port 75a2b8f815 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e62d574ead 
								
							 
						 
						
							
							
								
								Merge pull request  #1370  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-07-02 16:36:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								162adf61f2 
								
							 
						 
						
							
							
								
								Fix audio modals not using blurhash and poster ( #14199 )  
							
							
							
						 
						
							2020-07-02 16:27:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								1c8eb9bcf7 
								
							 
						 
						
							
							
								
								[Glitch] Fix the conditions for incomplete remote content  
							
							... 
							
							
							
							Port 7548a474a5 
							
						 
						
							2020-07-02 13:58:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9d127e15ff 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-07-02 13:56:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f1143a40d 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #13749 )  
							
							... 
							
							
							
							* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Taigi)
[ci skip]
* New translations en.yml (Taigi)
[ci skip]
* New translations simple_form.en.yml (Taigi)
[ci skip]
* New translations activerecord.en.yml (Taigi)
[ci skip]
* New translations devise.en.yml (Taigi)
[ci skip]
* New translations doorkeeper.en.yml (Taigi)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Silesian)
[ci skip]
* New translations en.yml (Silesian)
[ci skip]
* New translations simple_form.en.yml (Silesian)
[ci skip]
* New translations activerecord.en.yml (Silesian)
[ci skip]
* New translations devise.en.yml (Silesian)
[ci skip]
* New translations doorkeeper.en.yml (Silesian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-07-02 00:45:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7548a474a5 
								
							 
						 
						
							
							
								
								Fix the conditions for incomplete remote content ( #14195 )  
							
							
							
						 
						
							2020-07-01 23:38:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								665eb1affe 
								
							 
						 
						
							
							
								
								Merge pull request  #1369  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-07-01 21:51:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariel 
								
							 
						 
						
							
							
							
							
								
							
							
								f60c78ff3e 
								
							 
						 
						
							
							
								
								[Glitch] Fix cursor type in statuses  
							
							... 
							
							
							
							Port e9ea960773 
							
						 
						
							2020-07-01 20:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								24508bb837 
								
							 
						 
						
							
							
								
								[Glitch] Fix lock icon not being shown when locking account in profile settings  
							
							... 
							
							
							
							Port 4babf5b8b5 
							
						 
						
							2020-07-01 20:13:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								45deca65b3 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d23d40420 
								
							 
						 
						
							
							
								
								Change Redis#exists calls to Redis#exists? to avoid deprecation warning ( #14191 )  
							
							
							
						 
						
							2020-07-01 19:05:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariel 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9ea960773 
								
							 
						 
						
							
							
								
								Fix cursor type in statuses ( #14185 )  
							
							
							
						 
						
							2020-07-01 13:52:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4babf5b8b5 
								
							 
						 
						
							
							
								
								Fix lock icon not being shown when locking account in profile settings ( #14190 )  
							
							
							
						 
						
							2020-07-01 13:51:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35cedc922c 
								
							 
						 
						
							
							
								
								Change move handler to carry blocks over ( #14144 )  
							
							... 
							
							
							
							* 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 
							
						 
						
							2020-07-01 13:51:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								411bf188bb 
								
							 
						 
						
							
							
								
								follow-up  #14149  ( #14192 )  
							
							... 
							
							
							
							ran `yarn manage:translations en` 
							
						 
						
							2020-07-01 11:34:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								39a0622de7 
								
							 
						 
						
							
							
								
								Add support for li attribute to li element  
							
							
							
						 
						
							2020-07-01 01:02:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f186e0c91c 
								
							 
						 
						
							
							
								
								Add support for “start” and “reversed” attributes to ol element  
							
							... 
							
							
							
							Fixes  #1367  
						
							2020-07-01 01:02:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								814d3f343f 
								
							 
						 
						
							
							
								
								Merge pull request  #1366  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2020-07-01 00:18:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7aaf2b44ec 
								
							 
						 
						
							
							
								
								Fix remote files not using Content-Type header, streaming ( #14184 )  
							
							
							
						 
						
							2020-06-30 23:58:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3d7ce178dd 
								
							 
						 
						
							
							
								
								Use allow/deny-list instead of white/black-list in .env.production.sample  
							
							... 
							
							
							
							.env.production.sample has been nuked upstream, but we decided to keep it,
so change it to reflect latest changes in environment variable names.
(The link still refers to “whitelist_mode” because the documentation hasn't
been updated yet) 
							
						 
						
							2020-06-30 23:32:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								511edccf61 
								
							 
						 
						
							
							
								
								[Glitch] Add user notes on accounts  
							
							... 
							
							
							
							Port 65506bac3f 
							
						 
						
							2020-06-30 23:32:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									trwnh 
								
							 
						 
						
							
							
							
							
								
							
							
								50f5254568 
								
							 
						 
						
							
							
								
								[Glitch] Fix padding on account header  
							
							... 
							
							
							
							Port d1c6dd2d27 
							
						 
						
							2020-06-30 23:10:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								befe8c72dd 
								
							 
						 
						
							
							
								
								[Glitch] Fix read marker state not being udpated internally  
							
							... 
							
							
							
							Port fa4876a1b9 
							
						 
						
							2020-06-30 23:09:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								934bacd05f 
								
							 
						 
						
							
							
								
								[Glitch] Change sensitive preview cards to not blur text  
							
							... 
							
							
							
							Port a1ad2ad951 
							
						 
						
							2020-06-30 23:08:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce9ae9aa50 
								
							 
						 
						
							
							
								
								Bump diff-lcs from 1.3 to 1.4.3 ( #14186 )  
							
							... 
							
							
							
							Bumps [diff-lcs](https://github.com/halostatue/diff-lcs ) from 1.3 to 1.4.3.
- [Release notes](https://github.com/halostatue/diff-lcs/releases )
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md )
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.3...v1.4.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-30 13:18:38 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								742b0fedbd 
								
							 
						 
						
							
							
								
								Bump faker from 2.12.0 to 2.13.0 ( #14174 )  
							
							... 
							
							
							
							Bumps [faker](https://github.com/faker-ruby/faker ) from 2.12.0 to 2.13.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.12.0...v2.13.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-30 13:18:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								444b8d6188 
								
							 
						 
						
							
							
								
								Bump uuid from 8.1.0 to 8.2.0 ( #14162 )  
							
							... 
							
							
							
							Bumps [uuid](https://github.com/uuidjs/uuid ) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v8.1.0...v8.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-30 01:24:56 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59313b6f95 
								
							 
						 
						
							
							
								
								Bump jest-config from 26.0.1 to 26.1.0 ( #14176 )  
							
							... 
							
							
							
							Bumps [jest-config](https://github.com/facebook/jest/tree/HEAD/packages/jest-config ) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-config )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-30 01:24:46 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b198d6489 
								
							 
						 
						
							
							
								
								Fix trying to write non-existent image remote URL attribute on preview cards ( #14181 )  
							
							... 
							
							
							
							Regression from #14145  
							
						 
						
							2020-06-29 17:59:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa183a51ab 
								
							 
						 
						
							
							
								
								Add GitHub Sponsors  
							
							
							
						 
						
							2020-06-29 16:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c43dbb855 
								
							 
						 
						
							
							
								
								Bump redis-store from 1.8.2 to 1.9.0 ( #14160 )  
							
							... 
							
							
							
							Bumps [redis-store](https://github.com/jodosha/redis-store ) from 1.8.2 to 1.9.0.
- [Release notes](https://github.com/jodosha/redis-store/releases )
- [Changelog](https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jodosha/redis-store/compare/v1.8.2...v1.9.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2020-06-29 22:45:50 +09:00