ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f55fe1a5ee 
								
							 
						 
						
							
							
								
								Improve rendering of emoji which do not contrast with background ( #13772 )  
							
							... 
							
							
							
							* Refactor list of emoji requiring added outlines so that it can be theme-specific
* Split inaccessible emoji to emoji requiring an outline and ones that can be inverted
* Drop the “silouhettes” from black emoji as they seem to have changed color
* Add inaccessible emojis list for the light theme
* Use bordered emoji variant instead of unreliable CSS 
							
						 
						
							2020-06-09 10:28:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Lubar 
								
							 
						 
						
							
							
							
							
								
							
							
								da59204700 
								
							 
						 
						
							
							
								
								FIX: filters ignore media descriptions ( #13837 )  
							
							... 
							
							
							
							* FIX: filters ignore media descriptions
* remove parentheses to make codeclimate happy
* combine the text and run the regular expression only once.
https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581 
* Fix use of “filter” instead of “compact”, fix coding style issues
Co-authored-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-06-09 00:11:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								eda9bb35f1 
								
							 
						 
						
							
							
								
								Hide sensitive preview cards with blurhash ( #13985 )  
							
							... 
							
							
							
							* Use preview card blurhash in WebUI
* Handle sensitive preview cards 
							
						 
						
							2020-06-06 17:41:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								196bdd3dd7 
								
							 
						 
						
							
							
								
								Fix ref attr for react-textarea-autozsize ( #13936 )  
							
							
							
						 
						
							2020-06-02 03:24:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Choi 
								
							 
						 
						
							
							
							
							
								
							
							
								dba59712ca 
								
							 
						 
						
							
							
								
								[Glitch] Adjust flash alert contrast for better readability  
							
							... 
							
							
							
							Port 2b1a6e7597 
							
						 
						
							2020-06-01 18:31:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian C. Lindner 
								
							 
						 
						
							
							
							
							
								
							
							
								f8980d714a 
								
							 
						 
						
							
							
								
								[Glitch] Allow Ctrl-click to keep EmojiPicker window open  
							
							... 
							
							
							
							Port f8f195b8c2 
							
						 
						
							2020-06-01 18:31:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								61f1d4dbbf 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-06-01 18:21:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ariasuni 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc9dd7c99 
								
							 
						 
						
							
							
								
								Improve appearance of notification cleaning UI  
							
							... 
							
							
							
							- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available 
							
						 
						
							2020-06-01 12:28:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0c7a21a38c 
								
							 
						 
						
							
							
								
								Fix unsent toot confirmation dialog not popping up in single column ( #13888 )  
							
							
							
						 
						
							2020-05-31 20:38:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Choi 
								
							 
						 
						
							
							
							
							
								
							
							
								2b1a6e7597 
								
							 
						 
						
							
							
								
								Adjust flash alert contrast for better readability ( #13892 )  
							
							
							
						 
						
							2020-05-31 20:35:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian C. Lindner 
								
							 
						 
						
							
							
							
							
								
							
							
								f8f195b8c2 
								
							 
						 
						
							
							
								
								Allow Ctrl-click to keep EmojiPicker window open ( #13896 )  
							
							
							
						 
						
							2020-05-31 20:34:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ed6300f3c5 
								
							 
						 
						
							
							
								
								[Glitch] Fix timeline markers in Firefox  
							
							... 
							
							
							
							Port 366942b60f 
							
						 
						
							2020-05-29 20:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								948f988a04 
								
							 
						 
						
							
							
								
								[Glitch] Fix timeline markers not working on Chrome  
							
							... 
							
							
							
							Port bf68cd3bf0 
							
						 
						
							2020-05-29 20:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								cb592b80aa 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-05-29 19:27:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								366942b60f 
								
							 
						 
						
							
							
								
								Fix timeline markers in Firefox (regression from  #13887 ) ( #13889 )  
							
							... 
							
							
							
							Unfortunately, Firefox does not support the `keepalive` parameter
I used in the previous PR. However it supports the `navigator.sendBeacon`
API that allows that kind of things, but does not allow setting headers.
Therefore, this PR replaces it with a `sendBeacon` call that passes the
bearer token in the POST data.
Doorkeeper will then handle the auth token out of the box, as long as
it is passed as form data. Passing the query as JSON does not work. 
							
						 
						
							2020-05-29 19:25:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								bf68cd3bf0 
								
							 
						 
						
							
							
								
								Fix timeline markers not working on Chrome ( #13887 )  
							
							... 
							
							
							
							* Periodically save timeline markers
This saves timeline markers immediately upon message arrival, but not more
than once every 5 minutes.
This does not change how the markers are saved on closing the window,
except that it avoids submitting them if there is no need for it.
* Use the Fetch API when possible instead of XHR on window unload 
							
						 
						
							2020-05-29 16:14:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								cedf9b81e4 
								
							 
						 
						
							
							
								
								Fix local-only hashtag columns  
							
							
							
						 
						
							2020-05-28 15:21:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4e225a769a 
								
							 
						 
						
							
							
								
								Fix one import being made on mastodon's codebase instead of glitch-soc's  
							
							
							
						 
						
							2020-05-28 15:14:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								437f457b9f 
								
							 
						 
						
							
							
								
								[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI  
							
							... 
							
							
							
							Port 006af53406 
							
						 
						
							2020-05-28 14:08:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								1420db7e2d 
								
							 
						 
						
							
							
								
								[Glitch] Fix local streaming of hashtag timelines  
							
							... 
							
							
							
							Port 8dd03cf8f2 
							
						 
						
							2020-05-28 14:05:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dcb3e180b9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-05-28 13:44:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								22f2f6f43b 
								
							 
						 
						
							
							
								
								Fix Cmd-Enter not working to send toot  
							
							... 
							
							
							
							Fixes  #1333  
						
							2020-05-26 10:15:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel 
								
							 
						 
						
							
							
							
							
								
							
							
								006af53406 
								
							 
						 
						
							
							
								
								Change wording from “Hide media” to “Hide image/images” in Web UI ( #13834 )  
							
							
							
						 
						
							2020-05-25 12:30:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								8dd03cf8f2 
								
							 
						 
						
							
							
								
								Fix local streaming of hashtag timelines ( #13827 )  
							
							
							
						 
						
							2020-05-23 05:46:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								55f1aec9c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in sparkline style in web UI  
							
							... 
							
							
							
							Port bb9edd6321 
							
						 
						
							2020-05-14 18:50:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56e4533bab 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-05-14 18:49:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bb9edd6321 
								
							 
						 
						
							
							
								
								Fix regression in sparkline style in web UI ( #13753 )  
							
							
							
						 
						
							2020-05-14 09:01:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9ed6e0c1 
								
							 
						 
						
							
							
								
								[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted  
							
							... 
							
							
							
							Port 9af0613629 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ab970f996b 
								
							 
						 
						
							
							
								
								[Glitch] Fix some account avatars on public pages having incorrect size  
							
							... 
							
							
							
							Port e93c08ab96 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								80b1201644 
								
							 
						 
						
							
							
								
								[Glitch] Fix first poll option not being focused when adding a poll  
							
							... 
							
							
							
							Port 60dc5738cb 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b7b081bb51 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								4853a87df8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-05-13 22:11:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9af0613629 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								e93c08ab96 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								60dc5738cb 
								
							 
						 
						
							
							
								
								Fix first poll option not being focused when adding a poll ( #13740 )  
							
							... 
							
							
							
							Fixes  #13698  
						
							2020-05-12 15:29:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								25307798d7 
								
							 
						 
						
							
							
								
								Fix keybase config serializer ( #13742 )  
							
							
							
						 
						
							2020-05-12 15:28:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								885b2e3d86 
								
							 
						 
						
							
							
								
								[Glitch] Add remote only to public timeline  
							
							... 
							
							
							
							Port 861661100c 
							
						 
						
							2020-05-10 16:19:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5a2f0de845 
								
							 
						 
						
							
							
								
								[Glitch] Fix use of inline CSS in public pages  
							
							... 
							
							
							
							Port 20ffc12cda 
							
						 
						
							2020-05-10 16:19:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4e4e5316c1 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								861661100c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								86207f5421 
								
							 
						 
						
							
							
								
								Fix failing jest test ( #13681 )  
							
							
							
						 
						
							2020-05-08 21:21:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								20ffc12cda 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								8b8add863e 
								
							 
						 
						
							
							
								
								[Glitch] Fix admin-facing uses of inline CSS  
							
							... 
							
							
							
							Port a30829deee 
							
						 
						
							2020-05-03 21:47:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								3da2cd21fd 
								
							 
						 
						
							
							
								
								[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus  
							
							... 
							
							
							
							Port e88a05f707 
							
						 
						
							2020-05-03 21:47:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2ac3e3dc07 
								
							 
						 
						
							
							
								
								[Glitch] Fix end-user-facing uses of inline CSS  
							
							... 
							
							
							
							Port 3b7373ed4c 
							
						 
						
							2020-05-03 21:44:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f261370e7c 
								
							 
						 
						
							
							
								
								[Glitch] Refactor/cleanup TIMELINE_DELETE-related code  
							
							... 
							
							
							
							Port df5867f072 
							
						 
						
							2020-05-03 21:42:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e869a257d8 
								
							 
						 
						
							
							
								
								[Glitch] Fix messed up z-index when NoScript blocks media/previews  
							
							... 
							
							
							
							Port f53bd1bef6 
							
						 
						
							2020-05-03 21:41:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dfa13deaa1 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								a30829deee 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								e88a05f707 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								3b7373ed4c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								df5867f072 
								
							 
						 
						
							
							
								
								Refactor/cleanup TIMELINE_DELETE-related code ( #13175 )  
							
							
							
						 
						
							2020-04-28 09:53:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f53bd1bef6 
								
							 
						 
						
							
							
								
								Fix messed up z-index when NoScript blocks media/previews ( #13449 )  
							
							... 
							
							
							
							Fixes  #13444  
						
							2020-04-28 09:44:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2e92d55b64 
								
							 
						 
						
							
							
								
								[Glitch] Fix uninformative error message when uploading unsupported image files  
							
							... 
							
							
							
							Port cd3a0a17bc 
							
						 
						
							2020-04-25 15:29:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ed2267b78e 
								
							 
						 
						
							
							
								
								[Glitch] Fix expanded video player issues  
							
							... 
							
							
							
							Port 3526163340 
							
						 
						
							2020-04-25 15:28:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Irie Aoi 
								
							 
						 
						
							
							
							
							
								
							
							
								1e1b72ff72 
								
							 
						 
						
							
							
								
								[Glitch] Set max-width and max-height to gif video  
							
							... 
							
							
							
							Port cf1bf9dda9 
							
						 
						
							2020-04-25 15:26:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7195bca890 
								
							 
						 
						
							
							
								
								[Glitch] Fix and refactor keyboard navigation in dropdown menus  
							
							... 
							
							
							
							Port 69696c62b1 
							
						 
						
							2020-04-25 15:24:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2ac1f38bd8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-25 15:19:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								cd3a0a17bc 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								3526163340 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								cf1bf9dda9 
								
							 
						 
						
							
							
								
								Set max-width and max-height to gif video ( #13533 )  
							
							
							
						 
						
							2020-04-23 15:49:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								69696c62b1 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								0b8c354379 
								
							 
						 
						
							
							
								
								[Glitch] Update Twemoji to 12.1.5  
							
							... 
							
							
							
							Port emoji_map.json changes from 945c8e207e 
							
						 
						
							2020-04-20 16:54:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								6556bd1f67 
								
							 
						 
						
							
							
								
								[Glitch] Add local only to hashtag timeline  
							
							... 
							
							
							
							Port front-end changes from f5606cdab4 
							
						 
						
							2020-04-20 16:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4c125214de 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-20 16:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								945c8e207e 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								f5606cdab4 
								
							 
						 
						
							
							
								
								Add local only to hashtag timeline ( #13502 )  
							
							
							
						 
						
							2020-04-18 21:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f41a61965a 
								
							 
						 
						
							
							
								
								[Glitch] Fix uploaded image orientation in some browsers  
							
							... 
							
							
							
							Port 2444658e4b 
							
						 
						
							2020-04-18 15:48:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ecc53d10e1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-18 15:47:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2444658e4b 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								2c92697ec8 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to vote  
							
							... 
							
							
							
							Port 0f3317fbe2 
							
						 
						
							2020-04-17 22:04:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								28bdecf004 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 22:02:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0f3317fbe2 
								
							 
						 
						
							
							
								
								Fix not being able to vote ( #13490 )  
							
							... 
							
							
							
							Fix regression introduced by 53f9f8a4ce 
							
						 
						
							2020-04-17 21:54:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gurgen Hayrapetyan 
								
							 
						 
						
							
							
							
							
								
							
							
								f451095c04 
								
							 
						 
						
							
							
								
								[Glitch] Fix Poll fetchPoll action not being debounced.  
							
							... 
							
							
							
							Port 53f9f8a4ce 
							
						 
						
							2020-04-17 20:20:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								43a9ed3de8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 20:16:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gurgen Hayrapetyan 
								
							 
						 
						
							
							
							
							
								
							
							
								53f9f8a4ce 
								
							 
						 
						
							
							
								
								Fix Poll fetchPoll action not being debounced. ( #13485 )  
							
							... 
							
							
							
							* Fix Poll fetchPoll action not being debounced.
* Fix unused import in the Poll component 
							
						 
						
							2020-04-16 20:16:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9e12c3f3a7 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists  
							
							... 
							
							
							
							Port 9d57af78d2 
							
						 
						
							2020-04-12 17:01:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2f49575839 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours. 
							
						 
						
							2020-04-12 16:50:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9d57af78d2 
								
							 
						 
						
							
							
								
								Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )  
							
							... 
							
							
							
							* Fix following, followers and follow requests pagination
* Fix pagination of blocks and mutes 
							
						 
						
							2020-04-12 13:38:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6d3e240aa9 
								
							 
						 
						
							
							
								
								Clean up some dead code  
							
							
							
						 
						
							2020-04-10 14:47:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								79e5f368ed 
								
							 
						 
						
							
							
								
								Fix deprecated use of createBrowserHistory  
							
							
							
						 
						
							2020-04-09 17:03:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c13682bc0d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes. 
							
						 
						
							2020-04-05 18:32:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7745695860 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #13317 )  
							
							... 
							
							
							
							* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]
* New translations activerecord.en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations devise.en.yml (Galician)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations activerecord.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Persian)
[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.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-04-05 14:56:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								edce6fc98f 
								
							 
						 
						
							
							
								
								Fix “Show more” not switching to “Show less” on public pages ( #13174 )  
							
							... 
							
							
							
							* Fix “Show more” not switching to “Show less” on public pages
Fixes  #13169 
* Fix initial text of CW button on public pages when CW are unfolded by default 
							
						 
						
							2020-04-05 14:02:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								08e4bed98c 
								
							 
						 
						
							
							
								
								[Glitch] Add explanation as to why unlocked accounts may have follow requests  
							
							... 
							
							
							
							Port ffd6f3fa8a 
							
						 
						
							2020-04-04 21:59:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								04839f5dda 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to filter audit log in admin UI  
							
							... 
							
							
							
							Port 6932e0e2af 
							
						 
						
							2020-04-04 21:53:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d5b5225614 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-04 21:47:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ffd6f3fa8a 
								
							 
						 
						
							
							
								
								Add explanation as to why unlocked accounts may have follow requests ( #13385 )  
							
							... 
							
							
							
							* Add explanation as to why unlocked accounts may have follow requests
* Change wording to avoid “silenced” 
							
						 
						
							2020-04-04 19:02:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6932e0e2af 
								
							 
						 
						
							
							
								
								Add ability to filter audit log in admin UI ( #13381 )  
							
							
							
						 
						
							2020-04-03 13:06:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								56dba219d1 
								
							 
						 
						
							
							
								
								[Glitch] Improve polls: option lengths & redesign  
							
							... 
							
							
							
							Port abbc0c6a87 
							
						 
						
							2020-04-02 20:52:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								660a3d2b7a 
								
							 
						 
						
							
							
								
								[Glitch] Improve toot clicking areas  
							
							... 
							
							
							
							Port part of 899ff914da 
							
						 
						
							2020-04-02 20:49:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0a02eade54 
								
							 
						 
						
							
							
								
								[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW  
							
							... 
							
							
							
							Port 41ca3cdb37 
							
						 
						
							2020-04-02 20:45:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								989f819191 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI  
							
							... 
							
							
							
							Port 5a211c478d 
							
						 
						
							2020-04-02 20:45:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								61052dfa33 
								
							 
						 
						
							
							
								
								[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI  
							
							... 
							
							
							
							Port front-end changes from 1a993f9675 
							
						 
						
							2020-04-02 20:39:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								631dacf1d7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update. 
							
						 
						
							2020-04-02 20:32:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								abbc0c6a87 
								
							 
						 
						
							
							
								
								Improve polls: option lengths & redesign ( #13257 )  
							
							... 
							
							
							
							This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.
Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow. 
							
						 
						
							2020-04-02 17:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c2fc9bca81 
								
							 
						 
						
							
							
								
								Fix pinning a column in web UI sometimes redirecting out of web UI ( #13376 )  
							
							... 
							
							
							
							Fix  #13216  
						
							2020-04-02 03:12:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								899ff914da 
								
							 
						 
						
							
							
								
								Improve toot clicking areas ( #13327 )  
							
							... 
							
							
							
							* Make the area to the left “Show Thread” also expand the toot in Web UI
* Clicking the left part of a conversation with the avatars now opens it in Web UI 
							
						 
						
							2020-03-31 19:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								41ca3cdb37 
								
							 
						 
						
							
							
								
								Fix content warning being unnecessarily cleared when enabling/disabling CW ( #13348 )  
							
							
							
						 
						
							2020-03-31 14:10:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								5a211c478d 
								
							 
						 
						
							
							
								
								Fix wrong color for ellipsis in boost confirmation dialog in Web UI ( #13355 )  
							
							
							
						 
						
							2020-03-31 12:39:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1a993f9675 
								
							 
						 
						
							
							
								
								Fix 404 and 410 API errors being silently discarded in WebUI ( #13279 )  
							
							... 
							
							
							
							* Fix 404 and 410 API errors being silently discarded in WebUI
Fixes  #13278 
* Return more appropriate error when user replies to a deleted toot
* Please CodeClimate
* Fix 404/410 errors on fetching account timelines & identity proofs
* Refactor error handling
* Move error message string to statuses.errors 
							
						 
						
							2020-03-28 17:59:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5dbcafb998 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 15c02a7160 
							
						 
						
							2020-03-27 22:06:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6adb571c21 
								
							 
						 
						
							
							
								
								[Glitch] Change poll option hover/active styling to be less confusing  
							
							... 
							
							
							
							Port 421a3a8f08 
							
						 
						
							2020-03-27 22:06:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3788f37c30 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly. 
							
						 
						
							2020-03-27 21:54:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb4869690 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #13064 )  
							
							... 
							
							
							
							* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations devise.en.yml (Icelandic)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[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 simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.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.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Kabyle)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-03-25 23:17:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								15c02a7160 
								
							 
						 
						
							
							
								
								Fix frontend crash when deleting announcements ( #13312 )  
							
							... 
							
							
							
							Refactor and fix  #13283 , which only worked in some cases. 
							
						 
						
							2020-03-25 22:39:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								421a3a8f08 
								
							 
						 
						
							
							
								
								Change poll option hover/active styling to be less confusing ( #13313 )  
							
							
							
						 
						
							2020-03-25 22:39:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Sockwell 
								
							 
						 
						
							
							
							
							
								
							
							
								5e3049158e 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 577f74ad87 
							
						 
						
							2020-03-22 16:31:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e9338c7640 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in “Edit media” modal in web UI  
							
							... 
							
							
							
							Port c5731b4dc7 
							
						 
						
							2020-03-22 16:30:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								24e4647483 
								
							 
						 
						
							
							
								
								[Glitch] Change the string "hidden" to "blocked" in WebUI  
							
							... 
							
							
							
							Port 4a87cebf48 
							
						 
						
							2020-03-22 16:29:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3e87f56ab3 
								
							 
						 
						
							
							
								
								[Glitch] Change local media attachments to perform heavy processing asynchronously  
							
							... 
							
							
							
							Port front-end part of f459919552 
							
						 
						
							2020-03-22 16:26:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								99fc46d023 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes. 
							
						 
						
							2020-03-22 16:10:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shlee 
								
							 
						 
						
							
							
							
							
								
							
							
								056f97744a 
								
							 
						 
						
							
							
								
								Migrate Rails ujs as required for Rails 6 Upgrade. ( #13280 )  
							
							... 
							
							
							
							* Update yarn.lock
* Update package.json
* Update public.js
* Update admin.js
* Update log_out.js
* Update common.js 
							
						 
						
							2020-03-21 03:14:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								826ccfa973 
								
							 
						 
						
							
							
								
								Add link to bookmarks in web UI dropdown ( #13273 )  
							
							
							
						 
						
							2020-03-21 03:14:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Sockwell 
								
							 
						 
						
							
							
							
							
								
							
							
								577f74ad87 
								
							 
						 
						
							
							
								
								Fix frontend crash when deleting announcements ( #13283 )  
							
							... 
							
							
							
							This two-line change fixes a crash in the front end that occurred
under the following circumstances:
 *  A server had more than one announcement,
 *  A user was displaying the announcements, and
 *  An announcement was deleted (or unpublished, which amounts to
    the same thing.)
As might be expected, the bug was caused by attempting to access a
notification using an index value outside the bounds of the existing
announcements.  Specifically, in two places.  First,
`_markAnnouncementAsRead` attempts to modify announcements based on
the current index.  This is what caused the front end crash.  Second,
when rendering the `Announcements` component, the code paginates the
announcements and displays the current one.  This did not cause a
crash, but caused the front end to confusingly display a blank
announcement (in situations that would have caused a crash) with no
way for the user to navigate back to previous announcements.
This commit fixes both issues by adding a check to ensure that the
code never attempts to access an announcement with an index greater
than or equal to the number of announcements present. 
							
						 
						
							2020-03-21 03:10:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c3edb6c02a 
								
							 
						 
						
							
							
								
								Fix WebUI crash in single-column mode on prehistoric browsers ( #13267 )  
							
							... 
							
							
							
							Fixes  #13266  
						
							2020-03-17 20:43:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e16832bc9c 
								
							 
						 
						
							
							
								
								Fix missing media description dialog when sending toots with keyboard shortcuts  
							
							
							
						 
						
							2020-03-14 14:59:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								03309b0dc5 
								
							 
						 
						
							
							
								
								Fix posting privacy on secondary button with missing description confirmation dialog  
							
							
							
						 
						
							2020-03-14 12:33:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9af4ed237c 
								
							 
						 
						
							
							
								
								Fix privacy icon being displayed twice in glitch-soc Web UI  
							
							... 
							
							
							
							Fixes  #1298  
						
							2020-03-11 23:25:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2e3c24d1c8 
								
							 
						 
						
							
							
								
								Fix detailed view of direct messages displaying a 0 boost count ( #13244 )  
							
							... 
							
							
							
							The boost count is already removed from private toots,
do the same with direct messages. 
							
						 
						
							2020-03-10 18:39:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c5731b4dc7 
								
							 
						 
						
							
							
								
								Fix regression in “Edit media” modal in web UI ( #13243 )  
							
							
							
						 
						
							2020-03-10 11:59:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								4a87cebf48 
								
							 
						 
						
							
							
								
								Change the string "hidden" to "blocked" in WebUI ( #13221 )  
							
							... 
							
							
							
							* Change the string "hidden" to "blocked" in WebUI.
* update 
							
						 
						
							2020-03-09 09:13:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f459919552 
								
							 
						 
						
							
							
								
								Change local media attachments to perform heavy processing asynchronously ( #13210 )  
							
							... 
							
							
							
							Fix  #9106  
						
							2020-03-08 23:56:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								96df38d753 
								
							 
						 
						
							
							
								
								[Glitch] Add support for links to statuses in announcements to be opened in web UI  
							
							... 
							
							
							
							Port a67fd2fbe1 
							
						 
						
							2020-03-08 20:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								8dede28b01 
								
							 
						 
						
							
							
								
								[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI  
							
							... 
							
							
							
							Port 399fa48f8e 
							
						 
						
							2020-03-08 20:45:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bèr Kessels 
								
							 
						 
						
							
							
							
							
								
							
							
								96b18a705f 
								
							 
						 
						
							
							
								
								[Glitch] Code style improvements in JavaScript  
							
							... 
							
							
							
							Port b5d7ec71ef 
							
						 
						
							2020-03-08 20:43:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								ce8d13d2fb 
								
							 
						 
						
							
							
								
								[Glitch] Change description of privacy levels to be more intuitive in web UI  
							
							... 
							
							
							
							Port 263bedff9e 
							
						 
						
							2020-03-08 20:37:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								5325a14430 
								
							 
						 
						
							
							
								
								[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI  
							
							... 
							
							
							
							Port 38a26d5314 
							
						 
						
							2020-03-08 20:19:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								71d28dcfb9 
								
							 
						 
						
							
							
								
								[Glitch] Fix too large announcements not being scrollable in web UI  
							
							... 
							
							
							
							Port 1eae25af56 
							
						 
						
							2020-03-08 20:16:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									koyu 
								
							 
						 
						
							
							
							
							
								
							
							
								6a7c4c26f0 
								
							 
						 
						
							
							
								
								[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI  
							
							... 
							
							
							
							Port e899e0dc98 
							
						 
						
							2020-03-08 20:15:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d668512e64 
								
							 
						 
						
							
							
								
								[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI  
							
							... 
							
							
							
							Port 03d2704430 
							
						 
						
							2020-03-08 20:14:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								787b4748dc 
								
							 
						 
						
							
							
								
								[Glitch] Add tooltips to audio/video player buttons  
							
							... 
							
							
							
							Port 635812f9ea 
							
						 
						
							2020-03-08 19:59:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0fd3f87ea2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes. 
							
						 
						
							2020-03-08 19:38:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a67fd2fbe1 
								
							 
						 
						
							
							
								
								Add support for links to statuses in announcements to be opened in web UI ( #13212 )  
							
							... 
							
							
							
							* Add support for links to public statuses in announcements to be opened in WebUI
* Please CodeClimate 
							
						 
						
							2020-03-08 16:10:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								399fa48f8e 
								
							 
						 
						
							
							
								
								Change the tooltip "Toggle visibility" to "Hide media" in web UI ( #13199 )  
							
							
							
						 
						
							2020-03-08 16:09:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bèr Kessels 
								
							 
						 
						
							
							
							
							
								
							
							
								b5d7ec71ef 
								
							 
						 
						
							
							
								
								Code style improvements in JavaScript ( #13159 )  
							
							... 
							
							
							
							* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error. 
							
						 
						
							2020-03-08 16:02:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								263bedff9e 
								
							 
						 
						
							
							
								
								Change description of privacy levels to be more intuitive in web UI ( #13197 )  
							
							... 
							
							
							
							* Improve description of privacy levels in compose interface
* Change strings in defaultMessage and source as well as english
Co-authored-by: Thibaut Girka <thib@sitedethib.com> 
							
						 
						
							2020-03-08 15:59:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								38a26d5314 
								
							 
						 
						
							
							
								
								Fix text area above/right of emoji picker being accidentally clickable in web UI ( #13148 )  
							
							
							
						 
						
							2020-03-08 15:36:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1eae25af56 
								
							 
						 
						
							
							
								
								Fix too large announcements not being scrollable in web UI ( #13211 )  
							
							
							
						 
						
							2020-03-06 15:20:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									koyu 
								
							 
						 
						
							
							
							
							
								
							
							
								e899e0dc98 
								
							 
						 
						
							
							
								
								Change GIF label to be displayed even when autoplay is enabled in web UI ( #13209 )  
							
							
							
						 
						
							2020-03-06 05:31:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								03d2704430 
								
							 
						 
						
							
							
								
								Change the string "Hide everything from …" to "Block domain …" in web UI ( #13178 )  
							
							... 
							
							
							
							Blocking a domain is closer to blocking all its users than to a mute
action. 
							
						 
						
							2020-03-05 23:20:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								635812f9ea 
								
							 
						 
						
							
							
								
								Add tooltips to audio/video player buttons ( #13203 )  
							
							
							
						 
						
							2020-03-05 15:52:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								aaee86e276 
								
							 
						 
						
							
							
								
								[Glitch] Fix /web redirecting to /web/web in web UI  
							
							... 
							
							
							
							Port 13c00dc42c 
							
						 
						
							2020-02-25 14:30:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ea391ce8a1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-02-25 14:28:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c4b1ae964b 
								
							 
						 
						
							
							
								
								Document alt+enter  
							
							
							
						 
						
							2020-02-22 23:07:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								13c00dc42c 
								
							 
						 
						
							
							
								
								Fix /web redirecting to /web/web in web UI ( #13128 )  
							
							... 
							
							
							
							Fixes  #13127  
						
							2020-02-22 01:27:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4be41e4c4 
								
							 
						 
						
							
							
								
								[Glitch] Add source-mapped stacktrace to error message in web UI  
							
							... 
							
							
							
							Port 729fe5bfd6 
							
						 
						
							2020-02-19 23:31:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2f977ac8f3 
								
							 
						 
						
							
							
								
								[Glitch] Fix old browsers crashing because of missing finally polyfill in web UI  
							
							... 
							
							
							
							Port 3cdaa34783 
							
						 
						
							2020-02-19 23:10:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8e8cce20c7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-02-19 23:04:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								729fe5bfd6 
								
							 
						 
						
							
							
								
								Add source-mapped stacktrace to error message in web UI ( #13082 )  
							
							... 
							
							
							
							* Add source-mapped stack trace to copyable text in error boundary
* Add the error message to the copied report, not only the stack trace 
							
						 
						
							2020-02-19 22:36:52 +01:00