Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2b75728a80 
							
						 
					 
					
						
						
							
							[Glitch] Fix regression in sparkline style in web UI  
						
						... 
						
						
						
						Port c9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-14 18:50:57 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							f94aebafe5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-05-14 18:49:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c9dcc2d39f 
							
						 
					 
					
						
						
							
							Fix regression in sparkline style in web UI ( #13753 )  
						
						
						
						
					 
					
						2020-05-14 09:01:23 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							d147dd7588 
							
						 
					 
					
						
						
							
							[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted  
						
						... 
						
						
						
						Port 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-13 23:17:10 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							ef2f98317a 
							
						 
					 
					
						
						
							
							[Glitch] Fix some account avatars on public pages having incorrect size  
						
						... 
						
						
						
						Port 48503384d00525fe61a038bdb8a55868fdc1db92 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-13 23:17:10 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							6a17fa2b99 
							
						 
					 
					
						
						
							
							[Glitch] Fix first poll option not being focused when adding a poll  
						
						... 
						
						
						
						Port af6d35627978047724612c027e60cb0a89cb2eef to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-13 23:17:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							af53cfd19e 
							
						 
					 
					
						
						
							
							New Crowdin translations ( #13398 )  
						
						... 
						
						
						
						* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations activerecord.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations devise.en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations activerecord.en.yml (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Spanish, Argentina)
[ci skip]
* New translations devise.en.yml (Estonian)
[ci skip]
* New translations activerecord.en.yml (Estonian)
[ci skip]
* New translations devise.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Kazakh)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations activerecord.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Greek)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations devise.en.yml (Danish)
[ci skip]
* New translations activerecord.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations activerecord.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations activerecord.en.yml (Catalan)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations activerecord.en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (Spanish)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations devise.en.yml (Basque)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Portuguese)
[ci skip]
* New translations devise.en.yml (Polish)
[ci skip]
* New translations activerecord.en.yml (Polish)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Finnish)
[ci skip]
* New translations activerecord.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Italian)
[ci skip]
* New translations activerecord.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations activerecord.en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Finnish)
[ci skip]
* New translations devise.en.yml (Corsican)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations devise.en.yml (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations devise.en.yml (Sardinian)
[ci skip]
* New translations doorkeeper.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
						
						
					 
					
						2020-05-13 22:35:20 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3baacf6993 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-05-13 22:11:49 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92f85bea52 
							
						 
					 
					
						
						
							
							Change “hide/show boosts from …” menu to be hidden when the account is muted ( #13748 )  
						
						... 
						
						
						
						Otherwise, it may mislead users into believing this setting is an
exception to the muting behavior.
Fixes  #13744  
						
						
					 
					
						2020-05-13 21:20:45 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48503384d0 
							
						 
					 
					
						
						
							
							Fix some account avatars on public pages having incorrect size ( #13692 )  
						
						... 
						
						
						
						* Fix some account avatars on public pages having incorrect size
* Remove outdated and overridden width and height attributes
* Remove more hardcoded width/height attributes 
						
						
					 
					
						2020-05-13 21:20:34 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							af6d356279 
							
						 
					 
					
						
						
							
							Fix first poll option not being focused when adding a poll ( #13740 )  
						
						... 
						
						
						
						Fixes  #13698  
					
						2020-05-12 15:29:44 +02:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5daae6dc61 
							
						 
					 
					
						
						
							
							Fix keybase config serializer ( #13742 )  
						
						
						
						
					 
					
						2020-05-12 15:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
						
						
							
						
						
							559214c33f 
							
						 
					 
					
						
						
							
							[Glitch] Add remote only to public timeline  
						
						... 
						
						
						
						Port 26b08a3c54847f2816f78c3ac67ace001d3fea1f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-10 16:19:59 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							51508e5061 
							
						 
					 
					
						
						
							
							[Glitch] Fix use of inline CSS in public pages  
						
						... 
						
						
						
						Port c0b849bdfda8a2386bc85836d2d181890746de98 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-10 16:19:59 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							4a70792b4a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well. 
						
						
					 
					
						2020-05-10 16:19:56 +02:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							26b08a3c54 
							
						 
					 
					
						
						
							
							Add remote only to public timeline ( #13504 )  
						
						... 
						
						
						
						* Add remote only to public timeline
* Fix code style 
						
						
					 
					
						2020-05-10 10:36:18 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0d62e09707 
							
						 
					 
					
						
						
							
							Fix failing jest test ( #13681 )  
						
						
						
						
					 
					
						2020-05-08 21:21:57 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0b849bdfd 
							
						 
					 
					
						
						
							
							Fix use of inline CSS in public pages ( #13576 )  
						
						... 
						
						
						
						Change `account_link_to` to use an image tag rather than some
inline CSS. Dropped the `size` parameter in the process, but it wasn't
used for anything except the default value of 36px.
Dropped CSS rules that were always overriden, and defaulted to 36px width
and height instead. 
						
						
					 
					
						2020-05-03 22:04:18 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							89fcd68b75 
							
						 
					 
					
						
						
							
							[Glitch] Fix admin-facing uses of inline CSS  
						
						... 
						
						
						
						Port b8ba977497a53740e66d8db9938382b724283b3a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-03 21:47:58 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							7ea8b07b93 
							
						 
					 
					
						
						
							
							[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus  
						
						... 
						
						
						
						Port 77ec0875ea998072f4bb709bfb9b15e80669eeef to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-03 21:47:11 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							9e5a216878 
							
						 
					 
					
						
						
							
							[Glitch] Fix end-user-facing uses of inline CSS  
						
						... 
						
						
						
						Port 0e362b7678e75cb71ce207fd45dd4dc0d955fdca to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-03 21:44:43 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							4a5f93c25f 
							
						 
					 
					
						
						
							
							[Glitch] Refactor/cleanup TIMELINE_DELETE-related code  
						
						... 
						
						
						
						Port ad9c7aefe6618a70c69991b7daf100573a7e27b9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-03 21:42:13 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							502a0365df 
							
						 
					 
					
						
						
							
							[Glitch] Fix messed up z-index when NoScript blocks media/previews  
						
						... 
						
						
						
						Port 04eb59986461bc802d4432fe4131e09eadd070c0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-05-03 21:41:15 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							a22e6a3683 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior. 
						
						
					 
					
						2020-05-03 21:23:49 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b8ba977497 
							
						 
					 
					
						
						
							
							Fix admin-facing uses of inline CSS ( #13575 )  
						
						... 
						
						
						
						* Move .back-button inline styles to CSS file
All occurrences of the back-button CSS class used the same inline
CSS rules, so moved them over to the CSS file
* Fix “Add new domain block” button using inline CSS
* Replace common pattern of inline-styled button boxes by a CSS class
In particular, switching from `float: left/right` to a flexbox with
`justify-content: space-between`. This implied changing the order of
a few HTML tags and adding an empty `div` in one case.
Also removed a `margin-bottom` rule that wasn't needed due to the
margins of surrounding elements.
* Move account admin view inline CSS to CSS file 
						
						
					 
					
						2020-04-28 19:39:16 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							77ec0875ea 
							
						 
					 
					
						
						
							
							Fix page incorrectly scrolling when bringing up dropdown menus ( #13574 )  
						
						... 
						
						
						
						Fixes  #13573 
For some reason (I suspect this may be related to focusing the item before it
got drown by the browser), Firefox scrolls to top when bringing up dropdown
menus with pre-selected items.
This commit uses the “preventScroll” option as, due to the placement behavior,
the menu should be visible anyway and not trigger scrolling. 
					
						2020-04-28 13:19:39 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e362b7678 
							
						 
					 
					
						
						
							
							Fix end-user-facing uses of inline CSS ( #13438 )  
						
						... 
						
						
						
						* Move some inline styles to CSS files
* Move default_account_display_name span to fix useless tags with duplicate id
* Change handling of public pages spoiler text from inline CSS to dataset attribute
* Use the `dir` HTML attribute instead of inline CSS
* Move status action bar inline CSS to CSS file
* Hide logo resources from CSS file, not inline CSS
Fixes  #11601 
* Move translation prompt styling from inline CSS to CSS file
* Move “invited by” styling on registration form from inline to CSS file
* Use the progress tag to display poll results in JS fallback
* Fix poll results JS-less fallback when the user has voted for an option
* Change account public page “moved” notice to use img tags instead of inline CSS
* Move OTP hint inline CSS to SCSS file
* Hide JS-less fallback vote progressbars from accessibility tools
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
						
						
					 
					
						2020-04-28 10:16:55 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad9c7aefe6 
							
						 
					 
					
						
						
							
							Refactor/cleanup TIMELINE_DELETE-related code ( #13175 )  
						
						
						
						
					 
					
						2020-04-28 09:53:42 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							04eb599864 
							
						 
					 
					
						
						
							
							Fix messed up z-index when NoScript blocks media/previews ( #13449 )  
						
						... 
						
						
						
						Fixes  #13444  
					
						2020-04-28 09:44:17 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							9d41a410a3 
							
						 
					 
					
						
						
							
							[Glitch] Fix uninformative error message when uploading unsupported image files  
						
						... 
						
						
						
						Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-25 15:29:01 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							572e89e563 
							
						 
					 
					
						
						
							
							[Glitch] Fix expanded video player issues  
						
						... 
						
						
						
						Port c955f98d36868e85b0f1939a3a1c58c00babd4e8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-25 15:28:16 +02:00 
						 
				 
			
				
					
						
							
							
								Irie Aoi 
							
						 
					 
					
						
						
						
						
							
						
						
							0f4a8a6487 
							
						 
					 
					
						
						
							
							[Glitch] Set max-width and max-height to gif video  
						
						... 
						
						
						
						Port c5c8f680317a182c4794505007ef227a4294a18e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-25 15:26:42 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							ce33822e2c 
							
						 
					 
					
						
						
							
							[Glitch] Fix and refactor keyboard navigation in dropdown menus  
						
						... 
						
						
						
						Port 80182eda622e1317bffb6729259b8a81d84251a2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-25 15:24:02 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							8b2823b7b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-04-25 15:19:32 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							be637146f3 
							
						 
					 
					
						
						
							
							Fix uninformative error message when uploading unsupported image files ( #13540 )  
						
						... 
						
						
						
						Attempting to upload image files that the browser is unable to load results
in “Oops! An unexpected error occurred.”
This commit changes the error handling so that an unprocessable image results
in the file being sent anyway, which might cover a few corner cases, and
provide a slightly better error message. 
						
						
					 
					
						2020-04-25 12:27:29 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c955f98d36 
							
						 
					 
					
						
						
							
							Fix expanded video player issues ( #13541 )  
						
						... 
						
						
						
						Fixes  #13536 
- Expanding a paused video doesn't autoplay anymore
- Default volume level for the expanded video inherited from the original video
Position/playing state/volume are carried over from the original video player
to the modal, but they're not reported back to the modal as it would require
deeper changes. 
					
						2020-04-25 12:16:05 +02:00 
						 
				 
			
				
					
						
							
							
								Irie Aoi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5c8f68031 
							
						 
					 
					
						
						
							
							Set max-width and max-height to gif video ( #13533 )  
						
						
						
						
					 
					
						2020-04-23 15:49:33 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							80182eda62 
							
						 
					 
					
						
						
							
							Fix and refactor keyboard navigation in dropdown menus ( #13528 )  
						
						... 
						
						
						
						Fixes  #13527 
- Fixes caught keyboard events being needlessly propagated
- Let up/down arrows wrap around like the tab key does
- Refactor common code 
					
						2020-04-21 15:13:26 +02:00 
						 
				 
			
				
					
						
							
							
								D Anzorge 
							
						 
					 
					
						
						
						
						
							
						
						
							221ea4787f 
							
						 
					 
					
						
						
							
							[Glitch] Update Twemoji to 12.1.5  
						
						... 
						
						
						
						Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-20 16:54:01 +02:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
						
						
							
						
						
							7ceeb97f3d 
							
						 
					 
					
						
						
							
							[Glitch] Add local only to hashtag timeline  
						
						... 
						
						
						
						Port front-end changes from 2c7128c7f0ee3073acb9897cda88255982368193 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-20 16:52:56 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							63dc7cfa90 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-04-20 16:45:40 +02:00 
						 
				 
			
				
					
						
							
							
								D Anzorge 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							29f5353f8b 
							
						 
					 
					
						
						
							
							Update Twemoji to 12.1.5 ( #13021 )  
						
						... 
						
						
						
						* Update Twemoji to 12.1.5
SVGs from Twemoji repo https://github.com/twitter/twemoji 
* Update emoji_map.json to Unicode 12 
						
						
					 
					
						2020-04-19 23:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Takeshi Umeda 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2c7128c7f0 
							
						 
					 
					
						
						
							
							Add local only to hashtag timeline ( #13502 )  
						
						
						
						
					 
					
						2020-04-18 21:52:39 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9da1e734 
							
						 
					 
					
						
						
							
							[Glitch] Fix uploaded image orientation in some browsers  
						
						... 
						
						
						
						Port a1ce9cbb67facf705379355b9c8ec19c521b419c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-18 15:48:15 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							0cbc24e3b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-04-18 15:47:32 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a1ce9cbb67 
							
						 
					 
					
						
						
							
							Fix uploaded image orientation in some browsers ( #13493 )  
						
						... 
						
						
						
						Some browsers (at least recent Chrome versions) automatically take
image metadata into account when drawing images into a canvas.
There seem to be no way to prevent that behavior, and the only
way to detect it seems to compare with a known image.
See: https://github.com/w3c/csswg-drafts/issues/4666 
Solution adapted from: 1e4df70782 
						
						
					 
					
						2020-04-18 15:37:03 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							81ef26b67d 
							
						 
					 
					
						
						
							
							[Glitch] Fix not being able to vote  
						
						... 
						
						
						
						Port e12a5635da7de5a1c3b08b2ce420ee8a56ae4aff to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-17 22:04:10 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee65ba15e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2020-04-17 22:02:55 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e12a5635da 
							
						 
					 
					
						
						
							
							Fix not being able to vote ( #13490 )  
						
						... 
						
						
						
						Fix regression introduced by ab8d7c0680d7f75826277be4c8eea1ebd396be8a 
						
						
					 
					
						2020-04-17 21:54:25 +02:00 
						 
				 
			
				
					
						
							
							
								Gurgen Hayrapetyan 
							
						 
					 
					
						
						
						
						
							
						
						
							4849752a9c 
							
						 
					 
					
						
						
							
							[Glitch] Fix Poll fetchPoll action not being debounced.  
						
						... 
						
						
						
						Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com> 
						
						
					 
					
						2020-04-17 20:20:06 +02:00