Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3d8c1f6104 
								
							 
						 
						
							
							
								
								Attempt at fixing inline video player  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9614abc713 
								
							 
						 
						
							
							
								
								Update mediaGallery component's width when opening CWs  
							
							
							
						 
						
							2018-10-21 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2027ebe2 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								1cb7fe932d 
								
							 
						 
						
							
							
								
								Focus the UI when pressing Escape in the CW field  
							
							
							
						 
						
							2018-10-20 15:00:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a8e896af12 
								
							 
						 
						
							
							
								
								Fix fav/boosts hotkeys not working on detailed statuses  
							
							
							
						 
						
							2018-10-18 19:00:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ccf5ddfd88 
								
							 
						 
						
							
							
								
								Handle alt+enter in the spoiler input as shortcut for secondary post  
							
							... 
							
							
							
							Fixes  #780  
						
							2018-10-14 12:00:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								794b2dad99 
								
							 
						 
						
							
							
								
								Fix auto-unfold CWs when no regexp is set  
							
							... 
							
							
							
							Fixes  #778  
						
							2018-10-12 23:34:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dbc1b36b61 
								
							 
						 
						
							
							
								
								Allow selecting both default flavour and theme  
							
							... 
							
							
							
							Fixes  #672  
						
							2018-10-12 19:06:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								27376e2457 
								
							 
						 
						
							
							
								
								Improve signature verification safeguards ( #8959 )  
							
							... 
							
							
							
							* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit 65d1a2d10a 
							
						 
						
							2018-10-12 07:00:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								10ed0ddd2a 
								
							 
						 
						
							
							
								
								Merge pull request  #775  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-11 21:28:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								70a7f72fda 
								
							 
						 
						
							
							
								
								Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-11 14:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bf559a477a 
								
							 
						 
						
							
							
								
								Really fix HotKeys  
							
							
							
						 
						
							2018-10-10 17:40:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af3ef0afb0 
								
							 
						 
						
							
							
								
								Add description meta tag additionally to og:description ( #8941 )  
							
							... 
							
							
							
							Fix  #8685  
						
							2018-10-10 02:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c227151023 
								
							 
						 
						
							
							
								
								Add dns-prefetch if using different host for assets or uploads ( #8942 )  
							
							
							
						 
						
							2018-10-10 01:31:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8cb843039c 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								cf43973ecd 
								
							 
						 
						
							
							
								
								Fix that the copy button of verify link did not work. ( #8938 )  
							
							
							
						 
						
							2018-10-09 19:36:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0f37e924 
								
							 
						 
						
							
							
								
								Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )  
							
							
							
						 
						
							2018-10-09 19:35:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f9fc7d7660 
								
							 
						 
						
							
							
								
								Fix CW icon color in local-settings modal  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d21c9f08e5 
								
							 
						 
						
							
							
								
								Define some local-settings hints  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c40ba63f42 
								
							 
						 
						
							
							
								
								Add support for hints (or extended descriptions) in local-settings pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c598692cdf 
								
							 
						 
						
							
							
								
								When screen width is too narrow, hide local-settings page text, keep only icons  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56773bc55c 
								
							 
						 
						
							
							
								
								Change “preferences” icon to match settings page icon  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								065a19b18b 
								
							 
						 
						
							
							
								
								Add icons for each of the local-setting pages  
							
							
							
						 
						
							2018-10-09 18:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f09150f2a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-09 12:12:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d73c1df33b 
								
							 
						 
						
							
							
								
								Merge pull request  #770  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-10-09 12:11:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e968dcea13 
								
							 
						 
						
							
							
								
								Fix app-wide hotkeys randomly failing to work  
							
							
							
						 
						
							2018-10-09 12:10:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb43baf50 
								
							 
						 
						
							
							
								
								Add Japanese translations. ( #8927 )  
							
							
							
						 
						
							2018-10-09 07:12:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								683608dd60 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 15:34:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								96a313d02b 
								
							 
						 
						
							
							
								
								Fixed error occurrence when pinning the DM column. ( #8922 )  
							
							
							
						 
						
							2018-10-08 14:43:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								74e411f4e8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-08 13:51:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3f68e9ed11 
								
							 
						 
						
							
							
								
								Move “Show action buttons in collapsed toots” option  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								caa56b01a9 
								
							 
						 
						
							
							
								
								Switch from selects to radio buttons for local settings, improve styling  
							
							
							
						 
						
							2018-10-08 13:49:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								00d31a292c 
								
							 
						 
						
							
							
								
								rubocop issues - Cleaning up ( #8912 )  
							
							... 
							
							
							
							* cleanup pass
* undo mistakes
* fixed.
* revert 
							
						 
						
							2018-10-08 04:50:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								65d1a2d10a 
								
							 
						 
						
							
							
								
								Remove dead code ( #8919 )  
							
							... 
							
							
							
							SignatureVerification#matches_time_window? is not called anywhere. 
							
						 
						
							2018-10-08 04:48:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ashleyhull-versent 
								
							 
						 
						
							
							
							
							
								
							
							
								ea57aca5e1 
								
							 
						 
						
							
							
								
								Replace SVG asset with Custom mascot ( #8766 )  
							
							
							
						 
						
							2018-10-08 00:20:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b5168ebd 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								58cbb9ef8f 
								
							 
						 
						
							
							
								
								[Glitch] Change documentation URL  
							
							... 
							
							
							
							Port 7635a136c9 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								52f97080e7 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix margins of public-account-header__tabs  
							
							... 
							
							
							
							Port e2065ceead 
							
						 
						
							2018-10-07 22:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bdbbbb1bdb 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-07 19:47:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8b48543b77 
								
							 
						 
						
							
							
								
								Ensure only toots from the reported users are reported ( #8916 )  
							
							
							
						 
						
							2018-10-07 19:45:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4bab7eb35 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								07d123fd3c 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8901 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-10-06 20:42:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7635a136c9 
								
							 
						 
						
							
							
								
								Change documentation URL ( #8898 )  
							
							... 
							
							
							
							* Change documentation URL
* Fix hardcoded documentation URL in locales 
							
						 
						
							2018-10-06 14:33:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								e2065ceead 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								463f250f26 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-10-05 21:48:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								708c12af1e 
								
							 
						 
						
							
							
								
								Leave unknown language as nil if account is remote ( #8861 )  
							
							... 
							
							
							
							* Force use language detector if account is remote
* Set unknown remote toot's language as nil 
							
						 
						
							2018-10-05 19:17:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								72305816ea 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty  
							
							
							
						 
						
							2018-10-05 19:08:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d6df42df16 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								f627ea99e4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting. 
							
						 
						
							2018-10-05 15:23:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								48c2ab8cf5 
								
							 
						 
						
							
							
								
								Limit the number of people that can be followed from one account ( #8807 )  
							
							... 
							
							
							
							Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:
- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO
Fix  #2311  
							
						 
						
							2018-10-04 17:36:11 +02:00