Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								04bedd237b 
								
							 
						 
						
							
							
								
								Attempt at fixing inline video player  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dfa5b0576f 
								
							 
						 
						
							
							
								
								Update mediaGallery component's width when opening CWs  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e4c3ea1809 
								
							 
						 
						
							
							
								
								Force sensitive content flag when posting a toot with a CW  
							
							... 
							
							
							
							Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive. 
							
						 
						
							2018-10-20 17:06:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								13c3fa8d36 
								
							 
						 
						
							
							
								
								Focus the UI when pressing Escape in the CW field  
							
							
							
						 
						
							2018-10-20 15:00:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b13c34de3a 
								
							 
						 
						
							
							
								
								Fix fav/boosts hotkeys not working on detailed statuses  
							
							
							
						 
						
							2018-10-18 19:00:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b0527a4ce7 
								
							 
						 
						
							
							
								
								Handle alt+enter in the spoiler input as shortcut for secondary post  
							
							... 
							
							
							
							Fixes  #780  
						
							2018-10-14 12:00:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								70d346ea95 
								
							 
						 
						
							
							
								
								Fix auto-unfold CWs when no regexp is set  
							
							... 
							
							
							
							Fixes  #778  
						
							2018-10-12 23:34:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0075964244 
								
							 
						 
						
							
							
								
								Merge pull request  #775  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-11 21:28:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bb1103d974 
								
							 
						 
						
							
							
								
								Really fix HotKeys  
							
							
							
						 
						
							2018-10-10 17:40:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a02244f17c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js 
							
						 
						
							2018-10-09 21:08:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								e50cb5f4bd 
								
							 
						 
						
							
							
								
								Fix that the copy button of verify link did not work. ( #8938 )  
							
							
							
						 
						
							2018-10-09 19:36:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								269edc0e48 
								
							 
						 
						
							
							
								
								Fix CW icon color in local-settings modal  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								721aec40cd 
								
							 
						 
						
							
							
								
								Define some local-settings hints  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								26409f3e8e 
								
							 
						 
						
							
							
								
								Add support for hints (or extended descriptions) in local-settings pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5f308a7f05 
								
							 
						 
						
							
							
								
								When screen width is too narrow, hide local-settings page text, keep only icons  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6cd793f0ac 
								
							 
						 
						
							
							
								
								Change “preferences” icon to match settings page icon  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								edb9ec8543 
								
							 
						 
						
							
							
								
								Add icons for each of the local-setting pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								122ac9cd1d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-09 12:12:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4134a10549 
								
							 
						 
						
							
							
								
								Merge pull request  #770  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 12:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d0b1369a85 
								
							 
						 
						
							
							
								
								Fix app-wide hotkeys randomly failing to work  
							
							
							
						 
						
							2018-10-09 12:10:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								87abbb07f3 
								
							 
						 
						
							
							
								
								Add Japanese translations. ( #8927 )  
							
							
							
						 
						
							2018-10-09 07:12:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b368d3c15d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 15:34:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								770e337497 
								
							 
						 
						
							
							
								
								Fixed error occurrence when pinning the DM column. ( #8922 )  
							
							
							
						 
						
							2018-10-08 14:43:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d17844e6d1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 13:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								96c3d26870 
								
							 
						 
						
							
							
								
								Move “Show action buttons in collapsed toots” option  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								faecb35fe0 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								774ac47373 
								
							 
						 
						
							
							
								
								Add conversations API ( #8832 )  
							
							... 
							
							
							
							* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking 
							
						 
						
							2018-10-07 23:44:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a3677a828d 
								
							 
						 
						
							
							
								
								[Glitch] Change documentation URL  
							
							... 
							
							
							
							Port 28401962ca 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4ba1058b8 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins of public-account-header__tabs  
							
							... 
							
							
							
							Port 185cb2dc3a 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								611740ce81 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-07 19:47:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7cc7843109 
								
							 
						 
						
							
							
								
								Do not scroll timelines when *closing* media modals  
							
							... 
							
							
							
							Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases. 
							
						 
						
							2018-10-07 12:08:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								2fb692ea45 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8901 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-10-06 20:42:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								28401962ca 
								
							 
						 
						
							
							
								
								Change documentation URL ( #8898 )  
							
							... 
							
							
							
							* Change documentation URL
* Fix hardcoded documentation URL in locales 
							
						 
						
							2018-10-06 14:33:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								185cb2dc3a 
								
							 
						 
						
							
							
								
								RTL: fix margins of public-account-header__tabs ( #8897 )  
							
							... 
							
							
							
							* RTL: fix margins of public-account-header__tabs
* fix style
* even more stylish code :) 
							
						 
						
							2018-10-06 00:05:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								98bb6815a7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-05 21:48:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c6e4c48942 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty  
							
							
							
						 
						
							2018-10-05 19:08:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								42aecb4c13 
								
							 
						 
						
							
							
								
								Add a confirmation dialog when hitting reply and the compose box isn't empty ( #8893 )  
							
							... 
							
							
							
							* Add a confirmation dialog when hitting reply and the compose box isn't empty
Fixes  #878 
* Performance improvement 
							
						 
						
							2018-10-05 18:44:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e8f98a9d 
								
							 
						 
						
							
							
								
								Make hidden media clickable in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d82c495c0f 
								
							 
						 
						
							
							
								
								Add media description (or status spoiler) in account media gallery  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bd1f08fa9a 
								
							 
						 
						
							
							
								
								Fix account gallery hidden media background color in mastodon-light  
							
							
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eb85427576 
								
							 
						 
						
							
							
								
								[Glitch] Honour displayMedia setting in accountMedia gallery  
							
							... 
							
							
							
							Inspired by b79ab15859 
							
						 
						
							2018-10-02 22:00:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6ad7606909 
								
							 
						 
						
							
							
								
								[Glitch] Add support for new display_media setting  
							
							... 
							
							
							
							Port f7a6f9489d 
							
						 
						
							2018-10-01 16:48:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								15197a831c 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins: public-layout.header.nav-button  
							
							... 
							
							
							
							Port df2f4052b8 
							
						 
						
							2018-10-01 14:38:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								884a898442 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix statubar action buttons/counter margins  
							
							... 
							
							
							
							Port 9f6662fcc9 
							
						 
						
							2018-10-01 14:38:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								36d426cec9 
								
							 
						 
						
							
							
								
								[Glitch] Separate font-family into variable  
							
							... 
							
							
							
							Port d0d65b5a28 
							
						 
						
							2018-10-01 14:38:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c91d9b7389 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb 
							
						 
						
							2018-10-01 12:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d5d1b528e 
								
							 
						 
						
							
							
								
								Double the threshold for "read more" functionality ( #8835 )  
							
							
							
						 
						
							2018-10-01 03:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Spencer Alves 
								
							 
						 
						
							
							
							
							
								
							
							
								4e60a0d543 
								
							 
						 
						
							
							
								
								Add option to hide action bar in collapsed toots  
							
							
							
						 
						
							2018-09-30 08:31:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c065717b67 
								
							 
						 
						
							
							
								
								Merge pull request  #681  from ThibG/glitch-soc/fixes/accessibility  
							
							... 
							
							
							
							Port various accessibility improvements from upstream 
							
						 
						
							2018-09-29 19:01:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2bb3c8c944 
								
							 
						 
						
							
							
								
								Merge pull request  #755  from ThibG/glitch-soc/features/optional-reply-selection  
							
							... 
							
							
							
							Make pre-selection of usernames optional when replying to a toot 
							
						 
						
							2018-09-29 19:01:05 -05:00