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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							967e70663f 
							
						 
					 
					
						
						
							
							In REST API, when URL can be missing, cast it to nil ( #5259 )  
						
						
						
						
							
						
					 
					
						2017-10-07 18:55:48 +02:00 
						 
				 
			
				
					
						
							
							
								MitarashiDango 
							
						 
					 
					
						
						
						
						
							
						
						
							b7e65a004f 
							
						 
					 
					
						
						
							
							Japanese translation (relative time) ( #5251 )  
						
						
						
						
							
						
					 
					
						2017-10-08 01:32:03 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3a3475450e 
							
						 
					 
					
						
						
							
							Encode custom emojis as resolveable objects in ActivityPub ( #5243 )  
						
						... 
						
						
						
						* Encode custom emojis as resolveable objects in ActivityPub
* Improve code style 
						
						
							
						
					 
					
						2017-10-07 17:43:42 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							057db0ecd0 
							
						 
					 
					
						
						
							
							Update emoji-mart to v2.1.1 ( #5256 )  
						
						
						
						
							
						
					 
					
						2017-10-07 12:17:02 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							11436358b4 
							
						 
					 
					
						
						
							
							Fix regression from  #5206  - deduplicate descendants ( #5253 )  
						
						
						
						
							
						
					 
					
						2017-10-07 12:16:39 +02:00 
						 
				 
			
				
					
						
							
							
								Jeong Arm 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0a9e716c 
							
						 
					 
					
						
						
							
							Korean translation ( #5244 )  
						
						... 
						
						
						
						* [i18n] Korean translation
Add missing Korean translations.
[skip ci]
* start ci 
						
						
							
						
					 
					
						2017-10-07 14:16:59 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							45682f876d 
							
						 
					 
					
						
						
							
							Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )  
						
						
						
						
							
						
					 
					
						2017-10-07 02:38:52 +02:00 
						 
				 
			
				
					
						
							
							
								m4sk1n 
							
						 
					 
					
						
						
						
						
							
						
						
							4413d81d7f 
							
						 
					 
					
						
						
							
							i18n: Update Polish translation ( #5255 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
						
						
							
						
					 
					
						2017-10-06 22:43:32 +02:00 
						 
				 
			
				
					
						
							
							
								Lynx Kotoura 
							
						 
					 
					
						
						
						
						
							
						
						
							5a2c7bd4ce 
							
						 
					 
					
						
						
							
							Fix overflowing in web UI ( #5246 )  
						
						... 
						
						
						
						* Fix overflowing in web UI
* Revert fixing dropdown menu modal 
						
						
							
						
					 
					
						2017-10-06 20:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							5c8ca024ef 
							
						 
					 
					
						
						
							
							Improve error handling on LinkCrawlWorker ( #5250 )  
						
						... 
						
						
						
						* Improve error handling on LinkCrawlWorker
* Ignore TimeoutError and InvalidURIError too
* Record errors to debug log
* Enable dead job queue on LinkCrawlWorker
Since most of acceptable errors were already ignored, only our side issue should go to dead job queue.
* Ignore all http gem errors 
						
						
							
						
					 
					
						2017-10-06 20:39:08 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							d8b2f89d33 
							
						 
					 
					
						
						
							
							Fix remote profile being displayed in HTML on remote_follow ( #5249 )  
						
						
						
						
							
						
					 
					
						2017-10-06 20:38:29 +02:00 
						 
				 
			
				
					
						
							
							
								K.SHIRAKASHI 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f490b1a2 
							
						 
					 
					
						
						
							
							Fix error on reloading status detail column ( #5248 )  
						
						
						
						
							
						
					 
					
						2017-10-06 20:37:56 +02:00 
						 
				 
			
				
					
						
							
							
								unarist 
							
						 
					 
					
						
						
						
						
							
						
						
							c75ca0525b 
							
						 
					 
					
						
						
							
							Specify middleware versions in docker-compose.yml ( #5247 )  
						
						... 
						
						
						
						PostgreSQL10 has been released, but upgrading from older versions needs dump/restore. If you pull new version without those handling, db service will fail to launch.
To prevent accidentally upgrading, and as a recommended version, this patch specifies PostgreSQL and Redis version. 
						
						
							
						
					 
					
						2017-10-06 20:37:17 +02:00 
						 
				 
			
				
					
						
							
							
								MIYAGI Hikaru 
							
						 
					 
					
						
						
						
						
							
						
						
							6f2d88dd28 
							
						 
					 
					
						
						
							
							Fix error at emoji_compressed in Firefox ESR ( #5241 )  
						
						
						
						
							
						
					 
					
						2017-10-06 16:40:41 +02:00 
						 
				 
			
				
					
						
							
							
								Lynx Kotoura 
							
						 
					 
					
						
						
						
						
							
						
						
							daa59dd454 
							
						 
					 
					
						
						
							
							Fix theme settings ( #5242 )  
						
						
						
						
							
						
					 
					
						2017-10-06 13:29:53 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							72d939b69f 
							
						 
					 
					
						
						
							
							Fix thinking_face emoji autocomplete ( #5238 )  
						
						
						
						
							
						
					 
					
						2017-10-06 12:03:13 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							97b3d0cd56 
							
						 
					 
					
						
						
							
							Import only Spring/Motion from react-motion ( #5236 )  
						
						
						
						
							
						
					 
					
						2017-10-06 03:46:15 +02:00 
						 
				 
			
				
					
						
							
							
								Nolan Lawson 
							
						 
					 
					
						
						
						
						
							
						
						
							fd7f0732fe 
							
						 
					 
					
						
						
							
							Compress and combine emoji data ( #5229 )  
						
						
						
						
							
						
					 
					
						2017-10-06 03:42:34 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							eb5ac23434 
							
						 
					 
					
						
						
							
							Clean up code style of Mastodon::TimestampId module ( #5232 )  
						
						... 
						
						
						
						* Clean up code style of Mastodon::TimestampId module
* Update brakeman config 
						
						
							
						
					 
					
						2017-10-06 03:42:21 +02:00