manuelviens 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef55b341d 
								
							 
						 
						
							
							
								
								Update simple_form.fr.yml ( #11021 )  
							
							
							
						 
						
							2019-06-10 13:12:51 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									manuelviens 
								
							 
						 
						
							
							
							
							
								
							
							
								fbe879ceaf 
								
							 
						 
						
							
							
								
								Update fr.yml ( #11023 )  
							
							
							
						 
						
							2019-06-10 13:12:28 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									manuelviens 
								
							 
						 
						
							
							
							
							
								
							
							
								ce556333ce 
								
							 
						 
						
							
							
								
								Update fr.json ( #11024 )  
							
							
							
						 
						
							2019-06-10 13:07:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marek Ľach 
								
							 
						 
						
							
							
							
							
								
							
							
								4330629101 
								
							 
						 
						
							
							
								
								Update sk.yml ( #11015 )  
							
							... 
							
							
							
							* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml 
							
						 
						
							2019-06-09 22:55:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e428e320b6 
								
							 
						 
						
							
							
								
								Fix old migrations failing because of new version of strong_migrations ( #11018 )  
							
							
							
						 
						
							2019-06-09 22:55:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e16c8fbc7a 
								
							 
						 
						
							
							
								
								Fix old migrations failing because of new version of strong_migrations  
							
							... 
							
							
							
							Fixes  #1099  
						
							2019-06-09 22:32:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								654fd071b7 
								
							 
						 
						
							
							
								
								Add missing Korean translations ( #11014 )  
							
							
							
						 
						
							2019-06-09 21:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alix Rossi 
								
							 
						 
						
							
							
							
							
								
							
							
								9a281bac8d 
								
							 
						 
						
							
							
								
								i18n: Update Corsican front-end translation ( #11010 )  
							
							
							
						 
						
							2019-06-09 23:23:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0949c43ab3 
								
							 
						 
						
							
							
								
								Bump version to 2.9.0rc1 ( #11004 )  
							
							
							
						 
						
							2019-06-09 15:53:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5bdfd1640 
								
							 
						 
						
							
							
								
								Run yarn manage:translations ( #11008 )  
							
							
							
						 
						
							2019-06-09 15:52:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8746f4d17b 
								
							 
						 
						
							
							
								
								Change priority of delete activity forwards for replies and reblogs ( #11002 )  
							
							... 
							
							
							
							Fix  #11001  
						
							2019-06-09 12:47:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9add88a920 
								
							 
						 
						
							
							
								
								Fix position of search icon ( #11003 )  
							
							
							
						 
						
							2019-06-09 01:59:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								6ecf1825ef 
								
							 
						 
						
							
							
								
								i18n: Update Catalan translations ( #10998 )  
							
							... 
							
							
							
							* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
* i18n: Update Catalan translations
* i18n: Update Catalan translations 
							
						 
						
							2019-06-09 08:32:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								241a8e7b5f 
								
							 
						 
						
							
							
								
								Fix more issues in the light theme ( #10996 )  
							
							... 
							
							
							
							* Fix tabs bar in light theme
* Fix borders on small screens in light theme 
							
						 
						
							2019-06-08 22:32:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Darius Kazemi 
								
							 
						 
						
							
							
							
							
								
							
							
								4431ce52a6 
								
							 
						 
						
							
							
								
								Specify gzip required in tootctl emoji help ( #11000 )  
							
							
							
						 
						
							2019-06-08 12:43:11 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aditoo17 
								
							 
						 
						
							
							
							
							
								
							
							
								537e928186 
								
							 
						 
						
							
							
								
								I18n: Update Czech translation  🇨🇿  ( #10995 )  
							
							... 
							
							
							
							* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully) 
							
						 
						
							2019-06-08 17:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e9ddd5a159 
								
							 
						 
						
							
							
								
								Put poll options behind content warnings ( #10983 )  
							
							... 
							
							
							
							* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button 
							
						 
						
							2019-06-08 17:40:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20dda5cca0 
								
							 
						 
						
							
							
								
								Change full logo to use primary text color of the given theme ( #10994 )  
							
							... 
							
							
							
							* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme 
							
						 
						
							2019-06-08 15:30:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4bc77f290 
								
							 
						 
						
							
							
								
								Improve light theme ( #10992 )  
							
							
							
						 
						
							2019-06-08 10:23:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								25f93f4097 
								
							 
						 
						
							
							
								
								Fix RTL layout not being RTL within the columns area ( #10990 )  
							
							
							
						 
						
							2019-06-07 23:35:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11c28abcfe 
								
							 
						 
						
							
							
								
								Merge pull request  #1097  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-06-07 22:15:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aec3fa35fd 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to directly switch between list timelines in web UI  
							
							... 
							
							
							
							Port 5bfd802c57 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								417989ae34 
								
							 
						 
						
							
							
								
								[Glitch] Fix “mark as sensitive” not being used in delete & redraft  
							
							... 
							
							
							
							Port 2657765d2a 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								b32a62fe95 
								
							 
						 
						
							
							
								
								[Glitch] Scroll to compose form when focus  
							
							... 
							
							
							
							Port 8f3c32e29c 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc8f6b3cda 
								
							 
						 
						
							
							
								
								Fix some React warnings ( #10989 )  
							
							
							
						 
						
							2019-06-07 17:15:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								01aae33a5f 
								
							 
						 
						
							
							
								
								[Glitch] Fix refreshing featured toots when the new collection is empty  
							
							... 
							
							
							
							Port d34a3a2cc7 
							
						 
						
							2019-06-07 17:05:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								34b8346e7f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb 
							
						 
						
							2019-06-07 17:00:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								560ec24e58 
								
							 
						 
						
							
							
								
								Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )  
							
							
							
						 
						
							2019-06-07 16:51:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8360019896 
								
							 
						 
						
							
							
								
								Fix display of alt-text when a media attachment is not available  
							
							
							
						 
						
							2019-06-07 16:39:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								cdb420862e 
								
							 
						 
						
							
							
								
								Fix display of alt-text when a media attachment is not available ( #10981 )  
							
							
							
						 
						
							2019-06-07 12:41:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alix Rossi 
								
							 
						 
						
							
							
							
							
								
							
							
								62e6a29f0b 
								
							 
						 
						
							
							
								
								i18n: Update Corsican translations ( #10987 )  
							
							
							
						 
						
							2019-06-07 19:12:17 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1db4117030 
								
							 
						 
						
							
							
								
								Change preferences page into appearance, notifications, and other ( #10977 )  
							
							
							
						 
						
							2019-06-07 03:39:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a60364ca7d 
								
							 
						 
						
							
							
								
								Add waiting time to list of pending accounts in admin UI ( #10985 )  
							
							
							
						 
						
							2019-06-07 03:24:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								c672676c03 
								
							 
						 
						
							
							
								
								Fix sass-lint config ( #10982 )  
							
							
							
						 
						
							2019-06-06 18:51:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a03fb7b703 
								
							 
						 
						
							
							
								
								Change e-mail contact for CoC enforcement  
							
							
							
						 
						
							2019-06-06 17:42:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wenceslao Páez Chávez 
								
							 
						 
						
							
							
							
							
								
							
							
								fe3bf3b0fc 
								
							 
						 
						
							
							
								
								Fix overlap of emoji button on search popup ( #10978 )  
							
							
							
						 
						
							2019-06-06 13:40:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f6e72b30 
								
							 
						 
						
							
							
								
								Fix CW field automatically getting the focus when it is always enabled  
							
							
							
						 
						
							2019-06-06 13:26:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bfd802c57 
								
							 
						 
						
							
							
								
								Fix not being able to directly switch between list timelines in web UI ( #10973 )  
							
							
							
						 
						
							2019-06-06 13:04:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2657765d2a 
								
							 
						 
						
							
							
								
								Fix “mark as sensitive” not being used in delete & redraft ( #10980 )  
							
							
							
						 
						
							2019-06-06 13:04:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								70423ce81f 
								
							 
						 
						
							
							
								
								require rubocop-rails in .rubocop.yml ( #10974 )  
							
							... 
							
							
							
							* Revert "Revert #10957  (rubocop-rails) which is incompatible with CodeClimate (#10965 )"
This reverts commit 121d19d7fa 
							
						 
						
							2019-06-06 12:31:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								c402c291f4 
								
							 
						 
						
							
							
								
								Fix emoji picker being always displayed ( #10979 )  
							
							... 
							
							
							
							* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests 
							
						 
						
							2019-06-06 12:30:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								8f3c32e29c 
								
							 
						 
						
							
							
								
								Scroll to compose form when focus ( #10970 )  
							
							... 
							
							
							
							* Scroll to compose form when focus
* Get rid of constructor 
							
						 
						
							2019-06-05 15:29:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								cac9110533 
								
							 
						 
						
							
							
								
								Cleanup various controllers ( #10972 )  
							
							... 
							
							
							
							* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls 
							
						 
						
							2019-06-05 14:02:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7fa23ec697 
								
							 
						 
						
							
							
								
								Fix potential private status leak ( #10969 )  
							
							
							
						 
						
							2019-06-05 13:40:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d34a3a2cc7 
								
							 
						 
						
							
							
								
								Fix refreshing featured toots when the new collection is empty ( #10971 )  
							
							... 
							
							
							
							Fixes  #10945  
						
							2019-06-05 13:39:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff74aaca7c 
								
							 
						 
						
							
							
								
								Merge pull request  #1093  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-06-05 13:28:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6c464cd424 
								
							 
						 
						
							
							
								
								Do not misattribute inlined boosts if attributedTo isn't present ( #10967 )  
							
							... 
							
							
							
							* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes  #10950 
* Fix tests 
							
						 
						
							2019-06-04 23:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed19f33440 
								
							 
						 
						
							
							
								
								Fix margins on profile metadata in single column mode ( #10961 )  
							
							
							
						 
						
							2019-06-04 23:11:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a9a759f40 
								
							 
						 
						
							
							
								
								Change reblogs counter to be updated when boosted privately ( #10964 )  
							
							
							
						 
						
							2019-06-04 23:11:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2b743e715 
								
							 
						 
						
							
							
								
								Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )  
							
							
							
						 
						
							2019-06-04 23:11:18 +02:00