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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a36e4db82f 
								
							 
						 
						
							
							
								
								Fix not being able to directly switch between list timelines in web UI ( #10973 )  
							
							
							
						 
						
							2019-06-06 13:04:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								024ec0759c 
								
							 
						 
						
							
							
								
								Fix “mark as sensitive” not being used in delete & redraft ( #10980 )  
							
							
							
						 
						
							2019-06-06 13:04:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								88a04bf6c4 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								91ae2d1275 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								1fee4b0fe2 
								
							 
						 
						
							
							
								
								Fix refreshing featured toots when the new collection is empty ( #10971 )  
							
							... 
							
							
							
							Fixes  #10945  
						
							2019-06-05 13:39:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b01b8521ec 
								
							 
						 
						
							
							
								
								Fix margins on profile metadata in single column mode ( #10961 )  
							
							
							
						 
						
							2019-06-04 23:11:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a76c660645 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-04 20:40:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4331f4948e 
								
							 
						 
						
							
							
								
								Add profile directory link to single column navigation panel ( #10963 )  
							
							
							
						 
						
							2019-06-04 19:50:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								ca61d7577a 
								
							 
						 
						
							
							
								
								Add missing Korean translations ( #10962 )  
							
							... 
							
							
							
							And change some word. 
							
						 
						
							2019-06-04 18:00:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								3d34bc17e2 
								
							 
						 
						
							
							
								
								[Glitch] Fix profile picture preview  
							
							... 
							
							
							
							Port 77375ad7df 
							
						 
						
							2019-06-03 20:20:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a4e0071538 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock 
							
						 
						
							2019-06-03 14:54:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								77375ad7df 
								
							 
						 
						
							
							
								
								Fix profile picture preview ( #10931 )  
							
							
							
						 
						
							2019-06-02 18:04:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1501b142d2 
								
							 
						 
						
							
							
								
								Fix expanding status from menu modal in glitch-soc  
							
							... 
							
							
							
							Fixes  #1085  
						
							2019-06-02 14:11:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								96ac52dabd 
								
							 
						 
						
							
							
								
								Improvement variable height in single column layout ( #10917 )  
							
							... 
							
							
							
							* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas 
							
						 
						
							2019-06-02 10:05:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hanage999 
								
							 
						 
						
							
							
							
							
								
							
							
								702dbf1622 
								
							 
						 
						
							
							
								
								Center 2-columns layout without side effect ( #10915 )  
							
							
							
						 
						
							2019-06-01 07:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								206d0ea6a2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-30 13:31:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slice 
								
							 
						 
						
							
							
							
							
								
							
							
								fb0489022c 
								
							 
						 
						
							
							
								
								Fix incorrect PropType in Glitch AutosuggestInput  
							
							
							
						 
						
							2019-05-30 09:04:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slice 
								
							 
						 
						
							
							
							
							
								
							
							
								c12383e06c 
								
							 
						 
						
							
							
								
								Remove isRequired from Glitch ReplyIndicator status  
							
							... 
							
							
							
							This can be null under normal circumstances, which isRequired doesn't
like. 
							
						 
						
							2019-05-30 09:04:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								233a60f6a2 
								
							 
						 
						
							
							
								
								Change links in right panel to open in the same tab ( #10848 )  
							
							... 
							
							
							
							For Rambox compatibility 
							
						 
						
							2019-05-29 17:33:35 +03:00