Alda Marteau-Hardi 
							
						 
					 
					
						
						
						
						
							
						
						
							fbc6375fde 
							
						 
					 
					
						
						
							
							Add myself as codeowner of the translation files. ( #5333 )  
						
						
						
						
							
						
					 
					
						2017-10-11 21:21:13 +02:00 
						 
				 
			
				
					
						
							
							
								Alda Marteau-Hardi 
							
						 
					 
					
						
						
						
						
							
						
						
							0352c40e99 
							
						 
					 
					
						
						
							
							Use gender neutral language as in the rest of the french translation ( #5331 )  
						
						
						
						
							
						
					 
					
						2017-10-11 21:20:56 +02:00 
						 
				 
			
				
					
						
							
							
								aschmitz 
							
						 
					 
					
						
						
						
						
							
						
						
							e5d8166a12 
							
						 
					 
					
						
						
							
							Fix   #5329  ( #5332 )  
						
						... 
						
						
						
						This fixes  #5329 , which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty. 
						
						
							
						
					 
					
						2017-10-11 21:20:39 +02:00 
						 
				 
			
				
					
						
							
							
								Lynx Kotoura 
							
						 
					 
					
						
						
						
						
							
						
						
							07ea625cb2 
							
						 
					 
					
						
						
							
							Fix styles of error pages ( #5335 )  
						
						... 
						
						
						
						Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link> 
						
						
							
						
					 
					
						2017-10-11 21:18:45 +02:00 
						 
				 
			
				
					
						
							
							
								takayamaki 
							
						 
					 
					
						
						
						
						
							
						
						
							27101f1beb 
							
						 
					 
					
						
						
							
							fix presented og:url is incorrect ( #5320 )  
						
						
						
						
							
						
					 
					
						2017-10-11 19:22:21 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1823cf435a 
							
						 
					 
					
						
						
							
							In thread view, only scroll first update, scroll to replied-to post ( #5322 )  
						
						
						
						
							
						
					 
					
						2017-10-11 19:21:44 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							6a50329a9c 
							
						 
					 
					
						
						
							
							Only preload JS in /web pages ( #5325 )  
						
						
						
						
							
						
					 
					
						2017-10-11 19:20:55 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b17e571bc2 
							
						 
					 
					
						
						
							
							Add padding to Android icon, change Apple and MS icons ( #5321 )  
						
						
						
						
							
						
					 
					
						2017-10-11 19:11:15 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							476e79b8e3 
							
						 
					 
					
						
						
							
							Fully disable hotkeys when input element is focused ( #5324 )  
						
						... 
						
						
						
						Because alt+n is a way to enter some kinda letter on some keyboard 
						
						
							
						
					 
					
						2017-10-11 16:31:07 +02:00 
						 
				 
			
				
					
						
							
							
								JohnD28 
							
						 
					 
					
						
						
						
						
							
						
						
							19d3317a69 
							
						 
					 
					
						
						
							
							Update french translation : mastodon/locales/fr.json ( #5318 )  
						
						... 
						
						
						
						* Update fr.json
* Update fr.json
* Update fr.json 
						
						
							
						
					 
					
						2017-10-11 22:07:09 +09:00 
						 
				 
			
				
					
						
							
							
								JohnD28 
							
						 
					 
					
						
						
						
						
							
						
						
							fe6941e28e 
							
						 
					 
					
						
						
							
							Update doorkeeper.fr.yml ( #5317 )  
						
						
						
						
							
						
					 
					
						2017-10-11 22:04:36 +09:00 
						 
				 
			
				
					
						
							
							
								ButterflyOfFire 
							
						 
					 
					
						
						
						
						
							
						
						
							38600b2792 
							
						 
					 
					
						
						
							
							Update ar.json ( #5316 )  
						
						... 
						
						
						
						Pushing new arabic translated strings for Mastodon web client. 
						
						
							
						
					 
					
						2017-10-11 21:19:04 +09:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							b0407ece42 
							
						 
					 
					
						
						
							
							Fix an error when ancestors get loaded before the status itself ( #5312 )  
						
						... 
						
						
						
						When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly. 
						
						
							
						
					 
					
						2017-10-11 11:25:15 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							9b3d8ee346 
							
						 
					 
					
						
						
							
							Fix   #5281  - Fix tooltip/custom emoji/search interaction ( #5310 )  
						
						
						
						
							
						
					 
					
						2017-10-11 01:33:29 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b3d7ad958f 
							
						 
					 
					
						
						
							
							Fix   #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )  
						
						... 
						
						
						
						AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea 
						
						
							
						
					 
					
						2017-10-11 01:01:17 +02:00 
						 
				 
			
				
					
						
							
							
								takayamaki 
							
						 
					 
					
						
						
						
						
							
						
						
							552d22bec9 
							
						 
					 
					
						
						
							
							sign_in and sign_up views present og meta infos ( #5308 )  
						
						
						
						
							
						
					 
					
						2017-10-11 00:52:25 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7c33da45f0 
							
						 
					 
					
						
						
							
							Bump version to 2.0.0rc2  
						
						
						
						
							
						
					 
					
						2017-10-10 20:48:26 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							9815be2a44 
							
						 
					 
					
						
						
							
							Fix   #5293  - Pre-fill frequently used emojis to avoid bugs ( #5305 )  
						
						
						
						
							
						
					 
					
						2017-10-10 20:47:14 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							bebaa6eced 
							
						 
					 
					
						
						
							
							Remove prop types from external libraries ( #5304 )  
						
						
						
						
							
						
					 
					
						2017-10-10 18:44:51 +02:00 
						 
				 
			
				
					
						
							
							
								Jakob Kramer 
							
						 
					 
					
						
						
						
						
							
						
						
							616f53eea8 
							
						 
					 
					
						
						
							
							Update German translation ( #5302 )  
						
						
						
						
							
						
					 
					
						2017-10-10 23:12:18 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							61d3ecc805 
							
						 
					 
					
						
						
							
							Fix custom emoji copy not copying file ( #5298 )  
						
						
						
						
							
 
						
					 
					
						2017-10-10 15:18:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							4bb3e4eeba 
							
						 
					 
					
						
						
							
							Fix   #5295  - Order custom emoji lexicographically ( #5297 )  
						
						
						
						
							
						
					 
					
						2017-10-10 15:18:12 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							784c7510d7 
							
						 
					 
					
						
						
							
							Fix an error when video playback buffer is empty ( #5300 )  
						
						
						
						
							
						
					 
					
						2017-10-10 15:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								nullkal 
							
						 
					 
					
						
						
						
						
							
						
						
							6c54d2e583 
							
						 
					 
					
						
						
							
							foreign_key, non-nullable, dependent: destroy in account_moderation_notes ( #5294 )  
						
						... 
						
						
						
						* Add foreign key constraint to column `account` in `account_moderation_notes`
* Change account_id and target_account_id to non-nullable in account_moderation_notes
* Add dependent: :destroy to account and target_account in account_moderation_notes 
						
						
							
						
					 
					
						2017-10-10 13:12:17 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							96c942e8ab 
							
						 
					 
					
						
						
							
							Fix wrong dimensions on Android icon ( #5296 )  
						
						
						
						
							
						
					 
					
						2017-10-10 12:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aafe55af81 
							
						 
					 
					
						
						
							
							Material app icon for Chrome ( #5291 )  
						
						
						
						
							
						
					 
					
						2017-10-09 21:27:16 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fd49d5603a 
							
						 
					 
					
						
						
							
							Fix   #5278  - Update emoji-mart so invalid emoji IDs don't crash it ( #5290 )  
						
						
						
						
							
						
					 
					
						2017-10-09 20:52:40 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1c6fc0e4ce 
							
						 
					 
					
						
						
							
							Center error layout ( #5289 )  
						
						
						
						
							
						
					 
					
						2017-10-09 20:51:36 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							92e7815d1d 
							
						 
					 
					
						
						
							
							Fix   #5274  - Create symlink from public/500.html to public/assets/500.html ( #5288 )  
						
						
						
						
							
						
					 
					
						2017-10-09 20:51:24 +02:00 
						 
				 
			
				
					
						
							
							
								Jeong Arm 
							
						 
					 
					
						
						
						
						
							
						
						
							9d97054fe6 
							
						 
					 
					
						
						
							
							Remove timestamps on any option ( #5282 )  
						
						
						
						
							
						
					 
					
						2017-10-09 17:52:02 +02:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							cc796298c9 
							
						 
					 
					
						
						
							
							Fix pagination in Api::V1::BlocksController ( #5285 )  
						
						
						
						
							
						
					 
					
						2017-10-09 17:30:31 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							7fd66cf2fe 
							
						 
					 
					
						
						
							
							Fix migration failure due to StrongMigrations on production env ( #5283 )  
						
						
						
						
							
						
					 
					
						2017-10-09 10:05:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6e9e0c14e6 
							
						 
					 
					
						
						
							
							Fix dependency of error page generation on database ( #5280 )  
						
						
						
						
							
						
					 
					
						2017-10-09 10:05:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa810f9c8 
							
						 
					 
					
						
						
							
							Bump version to 2.0.0rc1 ( #5209 )  
						
						
						
						
							
						
					 
					
						2017-10-08 22:03:44 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3888a12c79 
							
						 
					 
					
						
						
							
							Fix   #5272  - Order of checks in ActivityPub handler ( #5276 )  
						
						
						
						
							
						
					 
					
						2017-10-08 22:03:34 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							cfa68907ae 
							
						 
					 
					
						
						
							
							Fix   #5271  - Fix missing attribute in remove_from_feed ( #5277 )  
						
						... 
						
						
						
						Regression from #4801  
						
						
							
						
					 
					
						2017-10-08 21:55:34 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							488584bfc1 
							
						 
					 
					
						
						
							
							Track frequently used emojis in web UI ( #5275 )  
						
						... 
						
						
						
						* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix  #5144  - Add tooltips to picker
* Display only 2 lines of frequently used emojis 
						
						
							
						
					 
					
						2017-10-08 21:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							0717d9b3e6 
							
						 
					 
					
						
						
							
							Set snowflake IDs for backdated statuses ( #5260 )  
						
						... 
						
						
						
						- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future 
						
						
							
						
					 
					
						2017-10-08 17:34:34 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6e4046fc3f 
							
						 
					 
					
						
						
							
							Fix   #5178  - Use object URI only in Announce, instead of embedding ( #5266 )  
						
						
						
						
							
						
					 
					
						2017-10-08 14:41:59 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
						
						
							
						
						
							f0c939c431 
							
						 
					 
					
						
						
							
							i18n: Update Polish translation ( #5270 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
						
						
							
						
					 
					
						2017-10-08 16:00:55 +09:00 
						 
				 
			
				
					
						
							
							
								Jeong Arm 
							
						 
					 
					
						
						
						
						
							
						
						
							ebadfe0ab7 
							
						 
					 
					
						
						
							
							Translate some Esperanto ( #5252 )  
						
						... 
						
						
						
						* Translate some Esperanto
* More translation
* More Esperanto translation
* Esperanto translation
* Fix mistaken format 
						
						
							
						
					 
					
						2017-10-08 14:30:14 +09:00 
						 
				 
			
				
					
						
							
							
								JeanGauthier 
							
						 
					 
					
						
						
						
						
							
						
						
							94f15338c3 
							
						 
					 
					
						
						
							
							i18n update Occitan ( #5263 )  
						
						... 
						
						
						
						* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json 
						
						
							
						
					 
					
						2017-10-08 14:18:27 +09:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							db33a53ee8 
							
						 
					 
					
						
						
							
							Video preload should be a string ( #5267 )  
						
						
						
						
							
						
					 
					
						2017-10-08 03:06:43 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							7de6d269d2 
							
						 
					 
					
						
						
							
							Use ES module build of react-router-dom ( #5264 )  
						
						
						
						
							
						
					 
					
						2017-10-08 02:55:58 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							684001d729 
							
						 
					 
					
						
						
							
							Dynamically calculate card height for embeds instead of padding ( #5265 )  
						
						... 
						
						
						
						The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height 
						
						
							
						
					 
					
						2017-10-08 02:34:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							292f3cd7e0 
							
						 
					 
					
						
						
							
							Show buffering in video player ( #5261 )  
						
						
						
						
							
						
					 
					
						2017-10-08 02:33:08 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a3d4f1bd93 
							
						 
					 
					
						
						
							
							Update outdated README ( #5262 )  
						
						
						
						
							
						
					 
					
						2017-10-07 21:20:59 +02:00 
						 
				 
			
				
					
						
							
							
								nullkal 
							
						 
					 
					
						
						
						
						
							
						
						
							633426b261 
							
						 
					 
					
						
						
							
							Add moderation note ( #5240 )  
						
						... 
						
						
						
						* Add moderation note
* Add frozen_string_literal
* Make rspec pass 
						
						
							
						
					 
					
						2017-10-07 20:26:43 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f486ef2666 
							
						 
					 
					
						
						
							
							Redesign public hashtag pages ( #5237 )  
						
						
						
						
							
						
					 
					
						2017-10-07 20:00:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d2dee6ea43 
							
						 
					 
					
						
						
							
							Fix custom emoji in emoji picker, persist skin tone ( #5258 )  
						
						
						
						
							
						
					 
					
						2017-10-07 19:02:30 +02:00