Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c2c93f8cd6 
								
							 
						 
						
							
							
								
								Fix deprecation warning for non-pipeline assets ( #4267 )  
							
							
							
						 
						
							2017-07-19 12:00:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								9fc082ea81 
								
							 
						 
						
							
							
								
								i18n: @716f4cb (pl) ( #4266 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-07-19 10:49:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Damien Erambert 
								
							 
						 
						
							
							
							
							
								
							
							
								4c7a9adb98 
								
							 
						 
						
							
							
								
								fix missing closing <p> tag in ToS in en.yml ( #4262 )  
							
							
							
						 
						
							2017-07-19 09:43:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								030e5cec58 
								
							 
						 
						
							
							
								
								Fix missing closing <p> tag in ToS in .yml files ( #4264 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-07-19 09:43:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								716f4cb11c 
								
							 
						 
						
							
							
								
								Add feature to revoke sessions ( #4259 )  
							
							
							
						 
						
							2017-07-19 04:59:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a5a07da892 
								
							 
						 
						
							
							
								
								Correct OStatus inflection (Ostatus -> OStatus) ( #4255 )  
							
							
							
						 
						
							2017-07-19 01:37:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								72108b20e2 
								
							 
						 
						
							
							
								
								feat(emoji): Add back title attribute ( #4253 )  
							
							
							
						 
						
							2017-07-18 22:49:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								0a678cf377 
								
							 
						 
						
							
							
								
								Fix for stylesheet split  
							
							
							
						 
						
							2017-07-18 11:28:52 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Surinna Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								7a77f7b3bb 
								
							 
						 
						
							
							
								
								Add sourceRoot/includePaths to loaders  
							
							... 
							
							
							
							Use the settings modal as an example/testcase 
							
						 
						
							2017-07-18 11:27:48 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lindwurm 
								
							 
						 
						
							
							
							
							
								
							
							
								767117f9b0 
								
							 
						 
						
							
							
								
								Update Japanese translation (chase  #4249 ) ( #4251 )  
							
							... 
							
							
							
							Signed-off-by: lindwurm <lindwurm.q@gmail.com> 
							
						 
						
							2017-07-18 20:03:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								fb7f06a752 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #4252 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-07-18 20:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								df74e26baf 
								
							 
						 
						
							
							
								
								Merge branch 'tootsuite-master'  
							
							
							
						 
						
							2017-07-18 18:59:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								d69fa9e1f4 
								
							 
						 
						
							
							
								
								Merge changes from upstream with the CSS reload fix  
							
							
							
						 
						
							2017-07-18 18:58:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lindwurm 
								
							 
						 
						
							
							
							
							
								
							
							
								0b4006fc47 
								
							 
						 
						
							
							
								
								Add Japanese translation for  #4246  ( #4249 )  
							
							... 
							
							
							
							Signed-off-by: lindwurm <lindwurm.q@gmail.com> 
							
						 
						
							2017-07-18 18:43:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lindwurm 
								
							 
						 
						
							
							
							
							
								
							
							
								0ccd47f413 
								
							 
						 
						
							
							
								
								Update Japanese translations for new landing page ( #4159 )  
							
							... 
							
							
							
							Signed-off-by: lindwurm <lindwurm.q@gmail.com> 
							
						 
						
							2017-07-18 18:42:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								02f896c12e 
								
							 
						 
						
							
							
								
								Fix broken CSS reload due to webpack upgrade ( #4250 )  
							
							
							
						 
						
							2017-07-18 18:42:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								bb4c3831b2 
								
							 
						 
						
							
							
								
								Add Japanese translation for  #4199  ( #4247 )  
							
							
							
						 
						
							2017-07-18 17:23:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								3267e4a785 
								
							 
						 
						
							
							
								
								Add unfollow modal (optional) ( #4246 )  
							
							... 
							
							
							
							* Add unfollow modal
* unfollowing someone
* remove unnecessary prop 
							
						 
						
							2017-07-18 17:14:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								89b988cab5 
								
							 
						 
						
							
							
								
								Introduce Ostatus name space ( #4164 )  
							
							... 
							
							
							
							* Wrap methods of ProcessFeedService::ProcessEntry in classes
This is a change same with 425acecfdb 
							
						 
						
							2017-07-18 16:39:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								4d42a38954 
								
							 
						 
						
							
							
								
								Improve admin page ( #4121 )  
							
							... 
							
							
							
							* Improve admin page
* Fix test
* Add spec
* Improve select style 
							
						 
						
							2017-07-18 16:38:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								8387b3928e 
								
							 
						 
						
							
							
								
								fix(push-subscriptions): Refactor how Sidekiq jobs are handled ( #4226 )  
							
							
							
						 
						
							2017-07-18 16:25:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								afa52e4d63 
								
							 
						 
						
							
							
								
								Fixed issue that the NSFW image is not hidden on detail page ( #4244 )  
							
							
							
						 
						
							2017-07-18 15:24:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								8949aad030 
								
							 
						 
						
							
							
								
								Add empty alt attribute to img elements in landing page ( #4243 )  
							
							
							
						 
						
							2017-07-18 15:22:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								c0c7af2194 
								
							 
						 
						
							
							
								
								Download npm and yarn from Alpine packages repository ( #4242 )  
							
							
							
						 
						
							2017-07-18 15:21:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f5382ec085 
								
							 
						 
						
							
							
								
								Exclude self toots from regular expression filter ( #4245 )  
							
							... 
							
							
							
							* Exclude self toots from regular expression filter
* refactor 
							
						 
						
							2017-07-18 15:20:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								407073d7a2 
								
							 
						 
						
							
							
								
								Move icu-dev to build-dependencies ( #4240 )  
							
							
							
						 
						
							2017-07-18 15:19:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7f4375822a 
								
							 
						 
						
							
							
								
								Install libidn11-dev in Vagrant ( #4238 )  
							
							
							
						 
						
							2017-07-18 00:31:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								719ab720a7 
								
							 
						 
						
							
							
								
								feat(push-notifications): Open link in current tab if possible ( #4228 )  
							
							... 
							
							
							
							* fix(push-notification): Open link in current tab if possible
* feat(sw): Skip waiting and claim clients 
							
						 
						
							2017-07-18 00:19:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								b11ac88692 
								
							 
						 
						
							
							
								
								Require any modules after loading polyfill in entry points ( #4231 )  
							
							... 
							
							
							
							app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.
Strictly enforce the rule to require any modules after loading
polyfill in entry points. 
							
						 
						
							2017-07-18 00:19:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								c727eae441 
								
							 
						 
						
							
							
								
								Updated from tootsuite  
							
							
							
						 
						
							2017-07-17 20:03:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								681c33d1f4 
								
							 
						 
						
							
							
								
								Quit overwriting style of extended-video-player ( #4237 )  
							
							... 
							
							
							
							Though size of extended-video-player is already fixed to 80vw*80vh in components.scss, player size was also set to original video size in extended_video_player.js. Video size is fixed to 80vw*80vh, so video player's size must also be fixed to 80vw*80vh. 
							
						 
						
							2017-07-17 19:05:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								7f35947d8e 
								
							 
						 
						
							
							
								
								Improve a query in WebPushNotificationWorker ( #4234 )  
							
							
							
						 
						
							2017-07-17 11:03:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								68941d4dfa 
								
							 
						 
						
							
							
								
								Use update method to update session in WebPushNotificationWorker ( #4235 )  
							
							
							
						 
						
							2017-07-17 11:03:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								1d2616b79b 
								
							 
						 
						
							
							
								
								fix(emojis): Handle multipoint emojis (e.g. country flags) ( #4221 )  
							
							
							
						 
						
							2017-07-17 10:57:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d4b097a88c 
								
							 
						 
						
							
							
								
								Add missing ActivityPub representations ( #4230 )  
							
							... 
							
							
							
							- Follow, undo follow
- Accept follow, reject follow
- Like, undo like
- Block, undo block
- Delete (note)
- Update (actor) 
							
						 
						
							2017-07-17 10:57:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								902c5cf7ca 
								
							 
						 
						
							
							
								
								i18n: update (pl) ( #4233 )  
							
							... 
							
							
							
							* i18n: update (pl)
* Update pl.yml 
							
						 
						
							2017-07-17 10:24:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								b15f790221 
								
							 
						 
						
							
							
								
								Require images in common.js ( #4232 )  
							
							
							
						 
						
							2017-07-17 10:23:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a47c2e8890 
								
							 
						 
						
							
							
								
								Add public key declaration to actors ( #4215 )  
							
							
							
						 
						
							2017-07-17 02:37:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								d0aad1ac85 
								
							 
						 
						
							
							
								
								Documentation and cleanup  
							
							
							
						 
						
							2017-07-16 17:13:16 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								21b04af524 
								
							 
						 
						
							
							
								
								Fixes lack of <tbody> in header metadata table  
							
							
							
						 
						
							2017-07-16 16:49:12 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a3202fd51e 
								
							 
						 
						
							
							
								
								Add SMTP_TLS variable for configuring TLS when server uses non-standard port ( #4227 )  
							
							
							
						 
						
							2017-07-16 23:48:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								1cceefce33 
								
							 
						 
						
							
							
								
								Check table existence on prepare_for_foreign_keys ( #4225 )  
							
							... 
							
							
							
							* Check table existence on prepare_for_foreign_keys
* Remove trailing whitespace 
							
						 
						
							2017-07-16 20:01:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								033f970af3 
								
							 
						 
						
							
							
								
								Don't mention default post privacy on hints for locked accounts ( #4222 )  
							
							... 
							
							
							
							"defaults post privacy to followers-only" only means...
* default value of `visibility` param on post API
* default value for web UI privacy setting (i.e. it will be overridden if they once updated)
...so, many users won't see an effect of it. 
							
						 
						
							2017-07-16 14:02:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c3e35d3f 
								
							 
						 
						
							
							
								
								Fix style settings for images in media modal ( #4220 )  
							
							... 
							
							
							
							* Shrink too wide single image modal
Fix too wide react-swipeable-view-container
Fix 0067f80 shrinking all react-swipeable-view-container
Change to apply max-width of react-swipeable-view-container only under media-modal.
Fix b30b03b just a typo
* Centering contents in image-loader
Centering small img, canvas, and video in image-loader. 
							
						 
						
							2017-07-16 11:52:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a6328fc1b1 
								
							 
						 
						
							
							
								
								Minor ActivityPub JSON fixes ( #4214 )  
							
							... 
							
							
							
							- Objects must have attributedTo instead of actor
- The current attribute belongs to CollectionPage, not Collection 
							
						 
						
							2017-07-16 10:28:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								35b868eeca 
								
							 
						 
						
							
							
								
								Install libidn with Docker ( #4219 )  
							
							
							
						 
						
							2017-07-16 04:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ondřej Hruška 
								
							 
						 
						
							
							
							
							
								
							
							
								3ea02314b9 
								
							 
						 
						
							
							
								
								split added glitch locales from vanilla ( #82 )  
							
							... 
							
							
							
							* Locale script now accepts overrides and new keys from glitch/locales
* Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts 
							
						 
						
							2017-07-16 01:15:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								4715161a93 
								
							 
						 
						
							
							
								
								FIXED STUFF FROM THE MERGE SORRY ;_;  
							
							
							
						 
						
							2017-07-15 15:42:39 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								144db8ea1d 
								
							 
						 
						
							
							
								
								poke and visible docs url  
							
							
							
						 
						
							2017-07-15 15:34:46 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kibigo! 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4202d00b 
								
							 
						 
						
							
							
								
								Ported updates from  #64  
							
							
							
						 
						
							2017-07-15 15:10:06 -07:00