David Yip 
							
						 
					 
					
						
						
							
						
						67ad453373 
					 
					
						
						
							
							Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4  
						
						 
						
						... 
						
						
						
						Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss 
						
						
					 
					
						2017-09-09 23:56:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Yip 
							
						 
					 
					
						
						
							
						
						b9f7bc149b 
					 
					
						
						
							
							Merge branch 'origin/master' into sync/upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb 
						
						
					 
					
						2017-09-09 14:27:47 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						7ca173be47 
					 
					
						
						
							
							Fix   #4850  - When visibility missing from API call to toot, fallback to user preference ( #4861 )  
						
						 
						
						
						
						
					 
					
						2017-09-09 02:02:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						7b8f262840 
					 
					
						
						
							
							Forward ActivityPub creates that reply to local statuses ( #4709 )  
						
						 
						
						... 
						
						
						
						* Forward ActivityPub creates that reply to local statuses
* Fix test
* Fix wrong signers 
						
						
					 
					
						2017-08-30 15:37:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						b7370ac8ba 
					 
					
						
						
							
							ActivityPub delivery ( #4566 )  
						
						 
						
						... 
						
						
						
						* Deliver ActivityPub Like
* Deliver ActivityPub Undo-Like
* Deliver ActivityPub Create/Announce activities
* Deliver ActivityPub creates from mentions
* Deliver ActivityPub Block/Undo-Block
* Deliver ActivityPub Accept/Reject-Follow
* Deliver ActivityPub Undo-Follow
* Deliver ActivityPub Follow
* Deliver ActivityPub Delete activities
Incidentally fix  #889 
* Adjust BatchedRemoveStatusService for ActivityPub
* Add tests for ActivityPub workers
* Add tests for FollowService
* Add tests for FavouriteService, UnfollowService and PostStatusService
* Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService
* Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService
* Add tests for BatchedRemoveStatusService
* Deliver updates to a local account to ActivityPub followers
* Minor adjustments 
						
						
					 
					
						2017-08-13 00:44:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kibigo! 
							
						 
					 
					
						
						
							
						
						09cfc079b0 
					 
					
						
						
							
							Merge upstream ( #81 )  
						
						 
						
						
						
						
					 
					
						2017-07-15 14:33:15 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e2685ccc81 
					 
					
						
						
							
							Fix   #4149 ,  fix   #1199  - Store emojis as unicode ( #4189 )  
						
						 
						
						... 
						
						
						
						- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore 
						
						
					 
					
						2017-07-14 19:47:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Surinna Curtis 
							
						 
					 
					
						
						
							
						
						3464bb30f8 
					 
					
						
						
							
							replies to local-only toots default to local-only, and fix some regex bugs  
						
						 
						
						
						
						
					 
					
						2017-07-06 22:30:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Surinna Curtis 
							
						 
					 
					
						
						
							
						
						a6f5111c79 
					 
					
						
						
							
							Eyes with variation-selector-16 now also do local-only  
						
						 
						
						
						
						
					 
					
						2017-06-26 20:51:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								beatrix-bitrot 
							
						 
					 
					
						
						
							
						
						93fc8aa14c 
					 
					
						
						
							
							keyword muting and local only tooting WIP  
						
						 
						
						
						
						
					 
					
						2017-06-26 02:19:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						b25e42a77f 
					 
					
						
						
							
							Misc tidying and clean ups ( #3445 )  
						
						 
						
						... 
						
						
						
						* Remove trailing whitespace in i18n mailers
* Use query methods instead of #present? on AR attributes
* Delegate Status#account_domain method
* Delegate Mention #account_username and #account_acct methods 
						
						
					 
					
						2017-05-31 20:38:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						88725d6ce8 
					 
					
						
						
							
							OEmbed support for PreviewCard ( #2337 )  
						
						 
						
						... 
						
						
						
						* OEmbed support for PreviewCard
* Improve ProviderDiscovery code failure treatment
* Do not crawl links if there is a content warning, since those
don't display a link card anyway
* Reset db schema
* Fresh migrate
* Fix rubocop style issues
Fix  #1681  - return existing access token when applicable instead of creating new
* Fix test
* Extract http client to helper
* Improve oembed controller 
						
						
					 
					
						2017-04-27 14:42:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keiji, Yoshimi 
							
						 
					 
					
						
						
							
						
						8fe36654ef 
					 
					
						
						
							
							attach_media should be in transaction of creation status ( #2426 )  
						
						 
						
						
						
						
					 
					
						2017-04-26 03:47:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8b5179d006 
					 
					
						
						
							
							Fix   #2402  - Add Idempotency-Key header to PostStatusService that prevents ( #2419 )  
						
						 
						
						... 
						
						
						
						duplicates. Web UI regenerates UUID for that header every time the compose
form is changed or successfully submitted
Also, fix Farsi i18n overwriting the English one 
						
						
					 
					
						2017-04-25 15:04:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Jankowski 
							
						 
					 
					
						
						
							
						
						297c11dba2 
					 
					
						
						
							
							Language detection refactor ( #2099 )  
						
						 
						
						... 
						
						
						
						* Extract detect_language to separate class
* Use default locale, not just en
* Add spec to confirm that whatlanguage cant identify empty string
* Allow account locale to override default in language detector
* PostStatusService supplies an account to detect language 
						
						
					 
					
						2017-04-18 22:20:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keiji, Yoshimi 
							
						 
					 
					
						
						
							
						
						7a5086729a 
					 
					
						
						
							
							reduce unneed query when post without attachements. ( #1907 )  
						
						 
						
						... 
						
						
						
						* reduce unneed query when post without attachements.
This commit reduce following query:
```
 MediaAttachment Load (0.9ms)  SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status
_id" IS NULL AND 1=0 ORDER BY id asc
```
* fixed for more simple changes. 
						
						
					 
					
						2017-04-17 04:23:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen 
							
						 
					 
					
						
						
							
						
						8ebed7fc68 
					 
					
						
						
							
							Fix   #1957  - WhatLanguage can return null. Fallback to 'en' ( #1959 )  
						
						 
						
						
						
						
					 
					
						2017-04-16 23:12:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen 
							
						 
					 
					
						
						
							
						
						e4af4898de 
					 
					
						
						
							
							Add language detection ( #1772 )  
						
						 
						
						... 
						
						
						
						* Add language detection via WhatLanguage and (de)serialization of it through Atom
* Fix default language in ProcessFeedService
* Re-add newline before 'react-rails' Gem to fix groupings
Fixes Code Climate issue 
						
						
					 
					
						2017-04-16 20:32:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chad Pytel 
							
						 
					 
					
						
						
							
						
						ad5ddd5e95 
					 
					
						
						
							
							Use I18n for media attachment validation errors  
						
						 
						
						... 
						
						
						
						These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized. 
						
						
					 
					
						2017-04-07 14:23:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5f511324b6 
					 
					
						
						
							
							Add validation of media attachments, clean up mastodon-own exception classes  
						
						 
						
						
						
						
					 
					
						2017-02-26 23:23:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rakib Hasan 
							
						 
					 
					
						
						
							
						
						87a6bed9e9 
					 
					
						
						
							
							previous commit was creating the status regardless  
						
						 
						
						... 
						
						
						
						of mix of video and images in status, just wasn't rendering
the show action. I moved the validation before the status creation 
						
						
					 
					
						2017-02-19 08:28:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rakib Hasan 
							
						 
					 
					
						
						
							
						
						6f9ecd899e 
					 
					
						
						
							
							revisted fix for  #462  
						
						 
						
						... 
						
						
						
						Moved validation to services/post_status_service.rb 
						
						
					 
					
						2017-02-19 08:28:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						3beb24ad55 
					 
					
						
						
							
							Use <summary> to encode content warnings instead  
						
						 
						
						
						
						
					 
					
						2017-01-25 16:53:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						999cde94a6 
					 
					
						
						
							
							Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text  
						
						 
						
						... 
						
						
						
						Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations 
						
						
					 
					
						2017-01-25 01:29:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blackle 
							
						 
					 
					
						
						
							
						
						bf0f6eb62d 
					 
					
						
						
							
							Implement a click-to-view spoiler system  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:07:40 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f0de621e76 
					 
					
						
						
							
							Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
						
						 
						
						
						
						
					 
					
						2017-01-20 01:00:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						e9737c2235 
					 
					
						
						
							
							Fix tests, add applications to eager loading/cache for statuses, fix  
						
						 
						
						... 
						
						
						
						application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464  until it's consistent with non-animated version 
						
						
					 
					
						2017-01-15 14:01:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Effy Elden 
							
						 
					 
					
						
						
							
						
						d6bc0e8db4 
					 
					
						
						
							
							Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views.  Resolves   #11  
						
						 
						
						
						
						
					 
					
						2017-01-15 08:58:50 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						80e02b90e4 
					 
					
						
						
							
							Private visibility on statuses prevents non-followers from seeing those  
						
						 
						
						... 
						
						
						
						Filters out hidden stream entries from Atom feed
Blocks now generate hidden stream entries, can be used to federate blocks
Private statuses cannot be reblogged (generates generic 422 error for now)
POST /api/v1/statuses now takes visibility=(public|unlisted|private) param instead of unlisted boolean
Statuses JSON now contains visibility=(public|unlisted|private) field 
						
						
					 
					
						2016-12-21 20:04:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						6de079a5af 
					 
					
						
						
							
							Removing external hub completely,  fix   #333  fixing digit-only hashtags,  
						
						 
						
						... 
						
						
						
						removing web app capability from non-webapp pages 
						
						
					 
					
						2016-12-18 12:24:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						14bd46946d 
					 
					
						
						
							
							Per-status control for unlisted mode, also federation for unlisted mode  
						
						 
						
						... 
						
						
						
						Fix  #233 , fix  #268  
						
						
					 
					
						2016-11-30 21:34:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						2d2c81765b 
					 
					
						
						
							
							Adding embedded PuSH server  
						
						 
						
						
						
						
					 
					
						2016-11-28 13:36:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						0603971894 
					 
					
						
						
							
							Adding sensitive marker to statuses in API  
						
						 
						
						
						
						
					 
					
						2016-11-23 10:46:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						fdc17bea58 
					 
					
						
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance  
						
						 
						
						
						
						
					 
					
						2016-11-15 16:56:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						48b9619439 
					 
					
						
						
							
							Adding hashtags  
						
						 
						
						
						
						
					 
					
						2016-11-05 17:13:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						3319473b2c 
					 
					
						
						
							
							Move PubSubHubbub pinging to a background worker  
						
						 
						
						... 
						
						
						
						It can take as much as 0.5s if not longer to complete 
						
						
					 
					
						2016-10-05 13:50:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						927333f4f8 
					 
					
						
						
							
							Improve code style  
						
						 
						
						
						
						
					 
					
						2016-09-29 21:28:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						499beb4484 
					 
					
						
						
							
							UI for uploading media attachments (and cancelling them)  
						
						 
						
						... 
						
						
						
						Mostly resolves  #8 , though attachments are still not displayed in public view 
						
						
					 
					
						2016-09-07 18:21:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						eec0dc46a6 
					 
					
						
						
							
							PostStatusService can attach media to status, ProcessFeedService likewise  
						
						 
						
						
						
						
					 
					
						2016-09-05 18:39:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8eeec389c1 
					 
					
						
						
							
							Add link to github project to footer, move FanOutOnWriteService calls to  
						
						 
						
						... 
						
						
						
						DistributionWorker. That isn't the heaviest service, yet, but gotta start
somewhere 
						
						
					 
					
						2016-03-25 03:22:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f97fc9744f 
					 
					
						
						
							
							Use FanOutOnWriteService AFTER processing mentions  
						
						 
						
						
						
						
					 
					
						2016-03-19 00:41:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						23d08c6749 
					 
					
						
						
							
							Changing the use of config constants to the Rails configuration object  
						
						 
						
						
						
						
					 
					
						2016-02-29 20:06:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						0e8f59c16f 
					 
					
						
						
							
							Refactoring Grape API methods into normal controllers & other things  
						
						 
						
						
						
						
					 
					
						2016-02-29 19:42:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						47d50b0e39 
					 
					
						
						
							
							A lot of fixes from a live test  
						
						 
						
						
						
						
					 
					
						2016-02-28 15:46:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						8fada4fae2 
					 
					
						
						
							
							When posting a status or reblogging one, ping hubs about the feed update  
						
						 
						
						
						
						
					 
					
						2016-02-28 14:33:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						71fe24096c 
					 
					
						
						
							
							Adding a Mention model, test stubs  
						
						 
						
						
						
						
					 
					
						2016-02-25 00:17:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						42eeecba3f 
					 
					
						
						
							
							Service to reblog statuses  
						
						 
						
						
						
						
					 
					
						2016-02-24 18:50:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						c967802c43 
					 
					
						
						
							
							Notify remote users about mentions  
						
						 
						
						
						
						
					 
					
						2016-02-24 18:44:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						79609d6270 
					 
					
						
						
							
							Add service for posting statuses (normal and replies), mention regex to  
						
						 
						
						... 
						
						
						
						fetch webfinger information of mentioned accounts 
						
						
					 
					
						2016-02-24 18:25:04 +01:00