Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a36c0efec7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-07-10 18:49:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e793d71486 
								
							 
						 
						
							
							
								
								Fix block/mute pagination in WebUI ( #14275 )  
							
							... 
							
							
							
							Fixes  #14274  
						
							2020-07-10 18:04:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								c952cc3115 
								
							 
						 
						
							
							
								
								[Glitch] Improve safety of Blurhash component  
							
							... 
							
							
							
							Port 66f9bd08da 
							
						 
						
							2020-07-10 17:08:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f2d0bd912c 
								
							 
						 
						
							
							
								
								[Glitch] Audio player visualization improvements  
							
							... 
							
							
							
							Port c2f5593be0 
							
						 
						
							2020-07-10 17:07:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1681c7c028 
								
							 
						 
						
							
							
								
								[Glitch] Freeze scroll position when a dropdown menu is open in the TL  
							
							... 
							
							
							
							Port bf40d331e6 
							
						 
						
							2020-07-10 17:05:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								2e73171628 
								
							 
						 
						
							
							
								
								[Glitch] Replace repetitive blurhash code with component ( #14267 )  
							
							... 
							
							
							
							Port 7418e0e613 
							
						 
						
							2020-07-10 16:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								24bc87b150 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-07-10 16:51:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c2f5593be0 
								
							 
						 
						
							
							
								
								Audio player visualization improvements ( #14281 )  
							
							... 
							
							
							
							* Fix audio player ticks position
* Split visualizer code into own file to comply with license
* Change top-left corner of visualizer always showing peaks, clean up code 
							
						 
						
							2020-07-10 13:57:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								29916e7143 
								
							 
						 
						
							
							
								
								Add attribution notice to the audio player component ( #14280 )  
							
							... 
							
							
							
							The code for rendering a frequency graph around a circle has been adopted (with modifications) from a CodePen by Alex Permyakov 
							
						 
						
							2020-07-10 12:25:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3876df0390 
								
							 
						 
						
							
							
								
								Fix clicking the audio player also opening toots in detailed view  
							
							
							
						 
						
							2020-07-10 10:28:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								66f9bd08da 
								
							 
						 
						
							
							
								
								Improve safety of Blurhash component ( #14278 )  
							
							... 
							
							
							
							There was a missed empty hash check. As well as rendering is now wrapped
in try/catch block, so app won't crash if any Blurhash component fails
to render its contents as it's not that critical. 
							
						 
						
							2020-07-09 22:32:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								bf40d331e6 
								
							 
						 
						
							
							
								
								Freeze scroll position when a dropdown menu is open in the TL ( #14271 )  
							
							... 
							
							
							
							* Freeze scroll position when a dropdown menu is open in the TL
* Apply this to direct TL as well
* Fix case when mouse leaves the menu 
							
						 
						
							2020-07-09 15:09:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								7418e0e613 
								
							 
						 
						
							
							
								
								Replace repetitive blurhash code with component ( #14267 )  
							
							... 
							
							
							
							This commit replaces all unnecessarily repeated code for decoding and
embedding blurhash canvases with separate component - <Blurhash>.
Under the hood Blurhash component will use effect dependent on its
props. This gives a few benefits: it will only be re-rendered whenever
the hash or width/height/dummy props update, and will not render if
canvas won't get to the final DOM, because then effect won't fire,
which prevents weird bugs like #14257 . 
							
						 
						
							2020-07-09 13:01:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								fc05a7fb1f 
								
							 
						 
						
							
							
								
								Change styling of account note editing buttons  
							
							... 
							
							
							
							Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> 
							
						 
						
							2020-07-09 12:19:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								4639832293 
								
							 
						 
						
							
							
								
								remove unused word. ( #14250 )  
							
							... 
							
							
							
							ran `yarn manage:translations en` 
							
						 
						
							2020-07-08 23:53:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								527f8abfa2 
								
							 
						 
						
							
							
								
								[Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads  
							
							... 
							
							
							
							Port 06f67cfca0 
							
						 
						
							2020-07-08 15:26:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1271de96f0 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail  
							
							... 
							
							
							
							Port 5a6b0ce051 
							
						 
						
							2020-07-08 15:26:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								72aeeb2b34 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail  
							
							... 
							
							
							
							Port ad1b26b4bc 
							
						 
						
							2020-07-08 15:25:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								67564cbb48 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-07-08 15:23:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								06f67cfca0 
								
							 
						 
						
							
							
								
								Fix new accent color not refreshing when changing thumbnail for audio uploads ( #14264 )  
							
							
							
						 
						
							2020-07-08 14:54:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5a6b0ce051 
								
							 
						 
						
							
							
								
								Fix WebUI crash on sensitive preview card with no preview thumbnail ( #14261 )  
							
							... 
							
							
							
							Follow-up on #14260  which only fixed half the call sites 
							
						 
						
							2020-07-08 12:58:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ad1b26b4bc 
								
							 
						 
						
							
							
								
								Fix WebUI crash on sensitive preview card with no preview thumbnail ( #14260 )  
							
							... 
							
							
							
							Fixes  #14257  
						
							2020-07-08 09:22:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								12a7717e66 
								
							 
						 
						
							
							
								
								Merge pull request  #1372  from ThibG/glitch-soc/fixes/local-only-public-option  
							
							... 
							
							
							
							Add option to show local-only toots in public timeline 
							
						 
						
							2020-07-07 19:58:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								52eaecaef7 
								
							 
						 
						
							
							
								
								Change styling and layout of account notes UI  
							
							
							
						 
						
							2020-07-07 19:25:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3c8a8a0b45 
								
							 
						 
						
							
							
								
								Change account note placeholder name since the design has diverged upstream  
							
							
							
						 
						
							2020-07-07 19:25:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								22c04b63cb 
								
							 
						 
						
							
							
								
								Fix being unable to add account notes  
							
							
							
						 
						
							2020-07-07 19:25:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								1144767ca8 
								
							 
						 
						
							
							
								
								[Glitch] Replace shortNumberFormat with <ShortNumber>  
							
							... 
							
							
							
							Port 55969e3bc2 
							
						 
						
							2020-07-07 19:25:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								409d00d256 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to choose media thumbnail in web UI  
							
							... 
							
							
							
							Port 825f73c3f9 
							
						 
						
							2020-07-07 15:58:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f0aee465d9 
								
							 
						 
						
							
							
								
								[Glitch] Fix hashtag column options styling  
							
							... 
							
							
							
							Port aa7142b9e2 
							
						 
						
							2020-07-07 15:58:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c2347f6cf6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one. 
							
						 
						
							2020-07-07 15:58:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								fd3649742c 
								
							 
						 
						
							
							
								
								Fix account note border radius ( #14251 )  
							
							
							
						 
						
							2020-07-07 13:46:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								825f73c3f9 
								
							 
						 
						
							
							
								
								Add ability to choose media thumbnail in web UI ( #14244 )  
							
							
							
						 
						
							2020-07-07 12:14:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								aa7142b9e2 
								
							 
						 
						
							
							
								
								Fix hashtag column options styling ( #14247 )  
							
							... 
							
							
							
							* Enable nonces for stylesheets
* Pass nonce to react-select 
							
						 
						
							2020-07-07 01:33:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b2d8b8a3 
								
							 
						 
						
							
							
								
								Change design of account notes in web UI ( #14208 )  
							
							... 
							
							
							
							* Change design of account notes in web UI
* Fix `for` -> `htmlFor` 
							
						 
						
							2020-07-07 01:24:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c67752f255 
								
							 
						 
						
							
							
								
								Fix vanilla flavour too  
							
							
							
						 
						
							2020-07-06 21:13:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								edd7bd26f6 
								
							 
						 
						
							
							
								
								Add UI option to show local-only toots in public timeline  
							
							
							
						 
						
							2020-07-06 21:12:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								55969e3bc2 
								
							 
						 
						
							
							
								
								Replace shortNumberFormat with <ShortNumber> ( #14061 )  
							
							... 
							
							
							
							This commit introduces new utility component - ShortNumber. It should
work almost the same way as original shortNumberFormat function,
though it also localizes units and accepts one more prop - renderer.
Renderer is a function that takes rendered short formatted number
and also ready-to-pluralize number to format display result accordingly.
Ready-to-pluralize number allows to correctly select plural for
compactly notated numbers, respecting thousands and other units.
Issue #12451  accurately describes the issue with using raw numbers
when replacing counter with short version. In short, it doesn't work
with languages such as Russian, that require different plurals,
according to the unit number was compacted to.
All previous usages of shortNumberFormat were replaced with new
function, and as it became unused, it was removed to avoid misleading. 
							
						 
						
							2020-07-06 14:27:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								e439151df3 
								
							 
						 
						
							
							
								
								Fix restored words from "toot" to "status" ( #14242 )  
							
							
							
						 
						
							2020-07-06 12:17:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3c51c7dd3e 
								
							 
						 
						
							
							
								
								[Glitch] Add color extraction for audio thumbnails  
							
							... 
							
							
							
							Port 8517a5fdb4 
							
						 
						
							2020-07-05 20:18:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								26227204df 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio modals not using blurhash and poster  
							
							... 
							
							
							
							Port 6163518115 
							
						 
						
							2020-07-05 20:18:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f5afdaa2e0 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								8517a5fdb4 
								
							 
						 
						
							
							
								
								Add color extraction for audio thumbnails ( #14209 )  
							
							
							
						 
						
							2020-07-05 18:28:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								6f6e9d8214 
								
							 
						 
						
							
							
								
								Fix-up  #13749  ( #14204 )  
							
							
							
						 
						
							2020-07-03 13:26:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e282f9b671 
								
							 
						 
						
							
							
								
								[Glitch] Add customizable thumbnails for audio and video attachments  
							
							... 
							
							
							
							Port a3ce01a102 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b907cc66e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix various issues around OpenGraph representation of media  
							
							... 
							
							
							
							Port audio player changes from 12ac904a33 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9d737108a6 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI  
							
							... 
							
							
							
							Port d0dc37eadb 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								27becaa9df 
								
							 
						 
						
							
							
								
								[Glitch] Change volume control and download buttons in web UI  
							
							... 
							
							
							
							Port ce34c13aff 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a67ad4ffce 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio player not working when media files are hosted on a different domain  
							
							... 
							
							
							
							Port 90477d7e4d 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a135f3bd98 
								
							 
						 
						
							
							
								
								[Glitch] Change design of audio players in web UI  
							
							... 
							
							
							
							Port 563a77d0b4 
							
						 
						
							2020-07-02 17:31:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6163518115 
								
							 
						 
						
							
							
								
								Fix audio modals not using blurhash and poster ( #14199 )  
							
							
							
						 
						
							2020-07-02 16:27:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								cd95fd8105 
								
							 
						 
						
							
							
								
								[Glitch] Fix the conditions for incomplete remote content  
							
							... 
							
							
							
							Port 911c385f2f 
							
						 
						
							2020-07-02 13:58:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5c6cf202ba 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-07-02 13:56:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								21f1cbaf30 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								911c385f2f 
								
							 
						 
						
							
							
								
								Fix the conditions for incomplete remote content ( #14195 )  
							
							
							
						 
						
							2020-07-01 23:38:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariel 
								
							 
						 
						
							
							
							
							
								
							
							
								98aa197c07 
								
							 
						 
						
							
							
								
								[Glitch] Fix cursor type in statuses  
							
							... 
							
							
							
							Port eee8b314af 
							
						 
						
							2020-07-01 20:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0f633143eb 
								
							 
						 
						
							
							
								
								[Glitch] Fix lock icon not being shown when locking account in profile settings  
							
							... 
							
							
							
							Port 9e14647df8 
							
						 
						
							2020-07-01 20:13:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariel 
								
							 
						 
						
							
							
							
							
								
							
							
								eee8b314af 
								
							 
						 
						
							
							
								
								Fix cursor type in statuses ( #14185 )  
							
							
							
						 
						
							2020-07-01 13:52:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9e14647df8 
								
							 
						 
						
							
							
								
								Fix lock icon not being shown when locking account in profile settings ( #14190 )  
							
							
							
						 
						
							2020-07-01 13:51:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								4b703d398a 
								
							 
						 
						
							
							
								
								follow-up  #14149  ( #14192 )  
							
							... 
							
							
							
							ran `yarn manage:translations en` 
							
						 
						
							2020-07-01 11:34:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								50f439db96 
								
							 
						 
						
							
							
								
								[Glitch] Add user notes on accounts  
							
							... 
							
							
							
							Port 3afc7977b1 
							
						 
						
							2020-06-30 23:32:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									trwnh 
								
							 
						 
						
							
							
							
							
								
							
							
								9dcd3388f6 
								
							 
						 
						
							
							
								
								[Glitch] Fix padding on account header  
							
							... 
							
							
							
							Port 41acf83cdf 
							
						 
						
							2020-06-30 23:10:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a11fac77f3 
								
							 
						 
						
							
							
								
								[Glitch] Fix read marker state not being udpated internally  
							
							... 
							
							
							
							Port 8b7066dc61 
							
						 
						
							2020-06-30 23:09:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1c3764c6f8 
								
							 
						 
						
							
							
								
								[Glitch] Change sensitive preview cards to not blur text  
							
							... 
							
							
							
							Port c92278aa1c 
							
						 
						
							2020-06-30 23:08:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								72ff9a1d65 
								
							 
						 
						
							
							
								
								Replace to testing-library from enzyme ( #14152 )  
							
							
							
						 
						
							2020-06-29 13:58:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									trwnh 
								
							 
						 
						
							
							
							
							
								
							
							
								41acf83cdf 
								
							 
						 
						
							
							
								
								Fix padding on account header ( #14179 )  
							
							
							
						 
						
							2020-06-29 13:57:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8b7066dc61 
								
							 
						 
						
							
							
								
								Fix read marker state not being udpated internally ( #14155 )  
							
							... 
							
							
							
							Fixes  #14151  
						
							2020-06-28 20:55:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5ea65bfe13 
								
							 
						 
						
							
							
								
								Fix public page CSS to match upstream's changes  
							
							... 
							
							
							
							Kind of a port of 1aed75c2d0 
							
						 
						
							2020-06-26 13:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								2700043e34 
								
							 
						 
						
							
							
								
								[Glitch] Improve appearence consistency of settings pages  
							
							... 
							
							
							
							Port 2fca9d3715 
							
						 
						
							2020-06-26 13:31:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								00283fe6ab 
								
							 
						 
						
							
							
								
								[Glitch] Fix design issues with sensitive preview cards  
							
							... 
							
							
							
							Port 907fe2996c 
							
						 
						
							2020-06-26 13:28:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								4500435bb1 
								
							 
						 
						
							
							
								
								[Glitch] Fix avatar size in public page detailed status  
							
							... 
							
							
							
							Port 528c103fc6 
							
						 
						
							2020-06-26 13:27:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0e33582bff 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-06-26 13:02:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								17c1443b23 
								
							 
						 
						
							
							
								
								Change to correct the role of the boost button ( #14132 )  
							
							
							
						 
						
							2020-06-25 22:44:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								528c103fc6 
								
							 
						 
						
							
							
								
								Fix avatar size in public page detailed status ( #14140 )  
							
							... 
							
							
							
							Regression from the inline-CSS changes 
							
						 
						
							2020-06-25 22:41:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ad588857 
								
							 
						 
						
							
							
								
								[Glitch] Fix very wide media attachments resulting in too thin a thumbnail  
							
							... 
							
							
							
							Port 90445230cd 
							
						 
						
							2020-06-24 16:01:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								26778b8c30 
								
							 
						 
						
							
							
								
								[Glitch] Fix modifier key to keep the EmojiPicker on macOS  
							
							... 
							
							
							
							Port c0b52ac871 
							
						 
						
							2020-06-24 15:56:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								2e48c4ae55 
								
							 
						 
						
							
							
								
								[Glitch] Fix unnecessary gap under of video modal  
							
							... 
							
							
							
							Port 88cbcb5804 
							
						 
						
							2020-06-24 15:55:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								90445230cd 
								
							 
						 
						
							
							
								
								Fix very wide media attachments resulting in too thin a thumbnail ( #14127 )  
							
							... 
							
							
							
							Fixes  #14094  
						
							2020-06-23 17:24:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a6ce37528e 
								
							 
						 
						
							
							
								
								Simplify filtering condition  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ash lea 
								
							 
						 
						
							
							
							
							
								
							
							
								3489cb87b7 
								
							 
						 
						
							
							
								
								never filter own posts from timeline  
							
							
							
						 
						
							2020-06-23 16:09:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								90477d7e4d 
								
							 
						 
						
							
							
								
								Fix audio player not working when media files are hosted on a different domain ( #14118 )  
							
							
							
						 
						
							2020-06-22 19:24:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								563a77d0b4 
								
							 
						 
						
							
							
								
								Change design of audio players in web UI ( #14095 )  
							
							
							
						 
						
							2020-06-21 02:27:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								c0b52ac871 
								
							 
						 
						
							
							
								
								Fix modifier key to keep the EmojiPicker on macOS ( #14096 )  
							
							
							
						 
						
							2020-06-20 13:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fuyu 
								
							 
						 
						
							
							
							
							
								
							
							
								88cbcb5804 
								
							 
						 
						
							
							
								
								Fix unnecessary gap under of video modal ( #14098 )  
							
							
							
						 
						
							2020-06-20 13:30:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aeba0f513d 
								
							 
						 
						
							
							
								
								[Glitch] Add hints about incomplete remote content to web UI  
							
							... 
							
							
							
							Port 32b7d341b7 
							
						 
						
							2020-06-17 17:48:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								743cef53d8 
								
							 
						 
						
							
							
								
								[Glitch] Fix initial audio volume not corresponding to what's displayed  
							
							... 
							
							
							
							Port 3f5fa64211 
							
						 
						
							2020-06-17 17:20:14 +02:00