Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								2a1e7f779b 
								
							 
						 
						
							
							
								
								[Glitch] Improvement variable height in single column layout  
							
							... 
							
							
							
							Port 96ac52dabd 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hanage999 
								
							 
						 
						
							
							
							
							
								
							
							
								1e0b2ffccf 
								
							 
						 
						
							
							
								
								[Glitch] Center 2-columns layout without side effect  
							
							... 
							
							
							
							Port 702dbf1622 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								552d5f818a 
								
							 
						 
						
							
							
								
								[Glitch] Refactor footers in web UI into a single component  
							
							... 
							
							
							
							Port 7d2b4e9277 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								a5709d8b76 
								
							 
						 
						
							
							
								
								[Glitch] Display notifications count on a new single column  
							
							... 
							
							
							
							Port 4c9d8f8ef9 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hanage999 
								
							 
						 
						
							
							
							
							
								
							
							
								7b14777589 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong redirect from getting started to home in advanced Web UI  
							
							... 
							
							
							
							Port 66081c489f 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9cdb0fd8c5 
								
							 
						 
						
							
							
								
								[Glitch] Improvements to the single column layout  
							
							... 
							
							
							
							Port 6d4af23a69 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								04edd3fbdb 
								
							 
						 
						
							
							
								
								[Glitch] Add responsive panels to the single-column layout  
							
							... 
							
							
							
							Port a1bceb2cb6 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9a3e47d27c 
								
							 
						 
						
							
							
								
								[Glitch] Various improvements to single column layout  
							
							... 
							
							
							
							Port 106cfa7553 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aa9377f77a 
								
							 
						 
						
							
							
								
								[Glitch] Add single-column mode  
							
							... 
							
							
							
							Port f9ca3d62b6 
							
						 
						
							2019-06-13 22:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4c2b1e87c7 
								
							 
						 
						
							
							
								
								Fix clicking on the elefriend  
							
							
							
						 
						
							2019-06-13 13:49:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3bf93a3612 
								
							 
						 
						
							
							
								
								Properly handle unboosting statuses from detailed view  
							
							... 
							
							
							
							Fixes  #1106  
						
							2019-06-12 10:12:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9e868158a5 
								
							 
						 
						
							
							
								
								[Glitch] Fix list not being automatically unpinned when it returns 404 in web UI  
							
							... 
							
							
							
							Port cbaff2bf53 
							
						 
						
							2019-06-11 21:57:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1b4242ddf7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-11 21:55:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								d12625fa74 
								
							 
						 
						
							
							
								
								l10n: update Persian translation ( #11050 )  
							
							... 
							
							
							
							* l10n: update Persian translation
* Update fa.yml 
							
						 
						
							2019-06-12 00:37:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									唐宗勛 
								
							 
						 
						
							
							
							
							
								
							
							
								cca89f3e06 
								
							 
						 
						
							
							
								
								update zh-CN translations ( #11046 )  
							
							
							
						 
						
							2019-06-11 13:08:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cbaff2bf53 
								
							 
						 
						
							
							
								
								Fix list not being automatically unpinned when it returns 404 in web UI ( #11045 )  
							
							
							
						 
						
							2019-06-11 02:26:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f03dd5728a 
								
							 
						 
						
							
							
								
								Add German translations ( #11043 )  
							
							
							
						 
						
							2019-06-10 21:36:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								403ab873d4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-10 20:09:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								17ee16cbfe 
								
							 
						 
						
							
							
								
								Fix clicking on the left side of a conversation not marking it as read ( #11041 )  
							
							
							
						 
						
							2019-06-10 19:27:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d0f90c3e9d 
								
							 
						 
						
							
							
								
								[Glitch] Fix RTL layout not being RTL within the columns area  
							
							... 
							
							
							
							Port b44ae7d284 
							
						 
						
							2019-06-10 18:59:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								abb2700350 
								
							 
						 
						
							
							
								
								[Glitch] Change preferences page into appearance, notifications, and other  
							
							... 
							
							
							
							Port SCSS changes from 8bf8d6d9d9 
							
						 
						
							2019-06-10 18:59:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5a158899bc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb 
							
						 
						
							2019-06-10 18:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								765b25f1cf 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							
							
						 
						
							2019-06-10 16:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2fe493ba25 
								
							 
						 
						
							
							
								
								Fix unboost confirmation dialog not showing up on detailed statuses  
							
							
							
						 
						
							2019-06-10 16:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6819b3333e 
								
							 
						 
						
							
							
								
								Add option to display a warning before boosting toots lacking media descriptions  
							
							
							
						 
						
							2019-06-10 16:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7dd32100c3 
								
							 
						 
						
							
							
								
								Add DM conversations mode similar to upstream  
							
							
							
						 
						
							2019-06-10 16:23:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								42a53e57d7 
								
							 
						 
						
							
							
								
								Fix emoji-button appearing above privacy-dropdown ( #11027 )  
							
							
							
						 
						
							2019-06-10 12:27:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									manuelviens 
								
							 
						 
						
							
							
							
							
								
							
							
								efe4ef1b20 
								
							 
						 
						
							
							
								
								Update fr.json ( #11024 )  
							
							
							
						 
						
							2019-06-10 13:07:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alix Rossi 
								
							 
						 
						
							
							
							
							
								
							
							
								6d44010dd4 
								
							 
						 
						
							
							
								
								i18n: Update Corsican front-end translation ( #11010 )  
							
							
							
						 
						
							2019-06-09 23:23:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								035755bf96 
								
							 
						 
						
							
							
								
								Run yarn manage:translations ( #11008 )  
							
							
							
						 
						
							2019-06-09 15:52:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f698e28803 
								
							 
						 
						
							
							
								
								Fix position of search icon ( #11003 )  
							
							
							
						 
						
							2019-06-09 01:59:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								df11f10efd 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								0984e09538 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aditoo17 
								
							 
						 
						
							
							
							
							
								
							
							
								2d601a278c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								21acf681d2 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								73e610790e 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								c7feecc715 
								
							 
						 
						
							
							
								
								Improve light theme ( #10992 )  
							
							
							
						 
						
							2019-06-08 10:23:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b44ae7d284 
								
							 
						 
						
							
							
								
								Fix RTL layout not being RTL within the columns area ( #10990 )  
							
							
							
						 
						
							2019-06-07 23:35:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e1c0da75 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to directly switch between list timelines in web UI  
							
							... 
							
							
							
							Port a36e4db82f 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c15ff07c69 
								
							 
						 
						
							
							
								
								[Glitch] Fix “mark as sensitive” not being used in delete & redraft  
							
							... 
							
							
							
							Port 024ec0759c 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								a473a7912b 
								
							 
						 
						
							
							
								
								[Glitch] Scroll to compose form when focus  
							
							... 
							
							
							
							Port 91ae2d1275 
							
						 
						
							2019-06-07 17:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5c1a46bdcf 
								
							 
						 
						
							
							
								
								Fix some React warnings ( #10989 )  
							
							
							
						 
						
							2019-06-07 17:15:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2c240378b2 
								
							 
						 
						
							
							
								
								[Glitch] Fix refreshing featured toots when the new collection is empty  
							
							... 
							
							
							
							Port 1fee4b0fe2 
							
						 
						
							2019-06-07 17:05:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								00552d2f79 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								390f22ab44 
								
							 
						 
						
							
							
								
								Fix display of alt-text when a media attachment is not available  
							
							
							
						 
						
							2019-06-07 16:39:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2b35ddc80a 
								
							 
						 
						
							
							
								
								Fix display of alt-text when a media attachment is not available ( #10981 )  
							
							
							
						 
						
							2019-06-07 12:41:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8bf8d6d9d9 
								
							 
						 
						
							
							
								
								Change preferences page into appearance, notifications, and other ( #10977 )  
							
							
							
						 
						
							2019-06-07 03:39:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								e20f7876e8 
								
							 
						 
						
							
							
								
								Fix sass-lint config ( #10982 )  
							
							
							
						 
						
							2019-06-06 18:51:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wenceslao Páez Chávez 
								
							 
						 
						
							
							
							
							
								
							
							
								796b8e8d34 
								
							 
						 
						
							
							
								
								Fix overlap of emoji button on search popup ( #10978 )  
							
							
							
						 
						
							2019-06-06 13:40:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2b54b78962 
								
							 
						 
						
							
							
								
								Fix CW field automatically getting the focus when it is always enabled  
							
							
							
						 
						
							2019-06-06 13:26:42 +02:00