Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								66fd8e7821 
								
							 
						 
						
							
							
								
								ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities ( #2197 )  
							
							... 
							
							
							
							* Clean up collapsible components
* Expose user Outboxes and AS2 representations of statuses
* Save work thus far.
* Fix bad merge.
* Save my work
* Clean up pagination.
* First test working.
* Add tests.
* Add Forbidden error template.
* Revert yarn.lock changes.
* Fix code style deviations and use localized instead of hardcoded English text. 
							
						 
						
							2017-04-23 05:21:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									alpaca-tc 
								
							 
						 
						
							
							
							
							
								
							
							
								2c0d756ad9 
								
							 
						 
						
							
							
								
								Extract error messages to locale file ( #2162 )  
							
							
							
						 
						
							2017-04-19 22:19:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									839 
								
							 
						 
						
							
							
							
							
								
							
							
								e2a1b574ab 
								
							 
						 
						
							
							
								
								Avoid dynamic methods due to processing speed ( #2080 )  
							
							
							
						 
						
							2017-04-18 15:57:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f5cd0b4956 
								
							 
						 
						
							
							
								
								Rename cache key to exclude_account_ids_for:id, adjust formatting  
							
							
							
						 
						
							2017-04-18 01:14:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2fd0473aa1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking  
							
							
							
						 
						
							2017-04-18 01:09:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									alpaca-tc 
								
							 
						 
						
							
							
							
							
								
							
							
								630de52fdd 
								
							 
						 
						
							
							
								
								Required foreign keys ( #2003 )  
							
							... 
							
							
							
							* Add `required: true` option to foreign column
* Fixes NoMethodError
```
> Favourite.new.valid?
NoMethodError: undefined method `reblog?' for nil:NilClass
``` 
							
						 
						
							2017-04-17 15:54:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								acd33101c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into fix/cache_blocking  
							
							
							
						 
						
							2017-04-17 01:41:33 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								73b0af5c93 
								
							 
						 
						
							
							
								
								Simplify the og:image and og:description code in stream_entries/show ( #1934 )  
							
							
							
						 
						
							2017-04-16 16:38:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Keiji Yoshimi 
								
							 
						 
						
							
							
							
							
								
							
							
								fd81916e86 
								
							 
						 
						
							
							
								
								cache blockings for reducing queries.  
							
							
							
						 
						
							2017-04-16 12:20:38 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								c172919745 
								
							 
						 
						
							
							
								
								Fix   #1339  - better Atom titles ( #1343 )  
							
							
							
						 
						
							2017-04-09 20:55:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joël Quenneville 
								
							 
						 
						
							
							
							
							
								
							
							
								d4c94fa004 
								
							 
						 
						
							
							
								
								DRY up reblog vs original status check  
							
							... 
							
							
							
							Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored. 
							
						 
						
							2017-04-07 14:18:30 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brad Urani 
								
							 
						 
						
							
							
							
							
								
							
							
								6a1da87cd3 
								
							 
						 
						
							
							
								
								Eliminate unnecessary queries and query clauses with none and all  
							
							
							
						 
						
							2017-04-05 06:02:58 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4c53af64f0 
								
							 
						 
						
							
							
								
								Fix ActionController::Parameters in API issue  
							
							
							
						 
						
							2017-04-04 01:33:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								de22c202f5 
								
							 
						 
						
							
							
								
								Add counter caches for a large performance increase on API requests  
							
							
							
						 
						
							2017-03-30 15:06:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								74ae158c2f 
								
							 
						 
						
							
							
								
								Add "direct" visibility level in the backend. Web UI is not yet  
							
							... 
							
							
							
							adjusted to allow choosing it, yet 
							
						 
						
							2017-03-15 22:55:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5f4e402204 
								
							 
						 
						
							
							
								
								Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies  
							
							... 
							
							
							
							Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors 
							
						 
						
							2017-03-05 17:27:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c64a1c25c4 
								
							 
						 
						
							
							
								
								Fix   #231  - Muting  
							
							
							
						 
						
							2017-03-02 18:49:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kit Redgrave 
								
							 
						 
						
							
							
							
							
								
							
							
								442fdbfc53 
								
							 
						 
						
							
							
								
								Mute button progress so far. WIP, doesn't entirely work correctly.  
							
							
							
						 
						
							2017-03-01 22:31:21 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4aa5ebe591 
								
							 
						 
						
							
							
								
								Split public timeline into "public timeline" which is local, and  
							
							... 
							
							
							
							"whole known network" which is what public timeline used to be
Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed 
							
						 
						
							2017-02-19 20:25:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								24ba7c9762 
								
							 
						 
						
							
							
								
								Adding index overview for reports in admin UI  
							
							
							
						 
						
							2017-02-16 02:28:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								31c633e528 
								
							 
						 
						
							
							
								
								Fix Status.permitted_for scope query  
							
							
							
						 
						
							2017-02-11 19:16:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dc851c922e 
								
							 
						 
						
							
							
								
								Mentions in private statuses allow mentioned people to see them  
							
							
							
						 
						
							2017-02-11 15:10:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0afed995ce 
								
							 
						 
						
							
							
								
								Fix the fix  
							
							
							
						 
						
							2017-02-09 21:22:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6331ed16e5 
								
							 
						 
						
							
							
								
								Fix   #614  - extra reply-boolean on statuses to account for cases when replied-to  
							
							... 
							
							
							
							status is not in the system at time of distribution; fix  #607  - reset privacy
settings to defaults when cancelling replies 
							
						 
						
							2017-02-09 20:25:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ac035108aa 
								
							 
						 
						
							
							
								
								Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines  
							
							
							
						 
						
							2017-02-07 00:06:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								347a153b3d 
								
							 
						 
						
							
							
								
								Add API modifiers to limit returned toots from public/hashtag timelines  
							
							... 
							
							
							
							to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen 
							
						 
						
							2017-02-06 23:16:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								77e13c2bc9 
								
							 
						 
						
							
							
								
								Removing failed push notification API, make context loads use cache  
							
							
							
						 
						
							2017-02-05 17:51:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d9ca46b464 
								
							 
						 
						
							
							
								
								Cleaning up format of broadcast real-time messages, removing  
							
							... 
							
							
							
							redis-backed "mentions" timeline as redundant (given notifications) 
							
						 
						
							2017-02-02 00:03:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bf60f2898d 
								
							 
						 
						
							
							
								
								Fix   #529  - Make hashtag timelines show conversations, fix hashtag loading in the UI  
							
							
							
						 
						
							2017-01-31 22:35:38 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								8d44281677 
								
							 
						 
						
							
							
								
								Set in_reply_to_account on statuses to non-self value when possible, thus  
							
							... 
							
							
							
							resolving the confusion from self-chain replies ultimately linking to a
non-self status. Adjust filters 
							
						 
						
							2016-12-31 14:36:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7376af90f7 
								
							 
						 
						
							
							
								
								Don't show statuses to blocked users  
							
							
							
						 
						
							2016-12-26 19:13:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6e064cf715 
								
							 
						 
						
							
							
								
								Fix account timelines bug  
							
							
							
						 
						
							2016-12-23 01:13:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b891a81008 
								
							 
						 
						
							
							
								
								Follow call on locked account creates follow request instead  
							
							... 
							
							
							
							Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts 
							
						 
						
							2016-12-22 23:03:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f91b6fa9e1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into development  
							
							
							
						 
						
							2016-12-22 11:35:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3caf0cfb03 
								
							 
						 
						
							
							
								
								Ensure that reblogs and favs always refer to the original status rather than a reblog wrapper  
							
							
							
						 
						
							2016-12-22 11:34:05 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								84d2371d6a 
								
							 
						 
						
							
							
								
								Fix  
							
							
							
						 
						
							2016-12-06 00:24:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								39cc9fde8a 
								
							 
						 
						
							
							
								
								Add account suspension  
							
							
							
						 
						
							2016-12-05 22:59:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b14b5e3b44 
								
							 
						 
						
							
							
								
								Improve notification model  
							
							
							
						 
						
							2016-12-03 20:04:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								816284d739 
								
							 
						 
						
							
							
								
								Fix   #248  - Reload all accounts when fetching from cache  
							
							
							
						 
						
							2016-12-03 18:21:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3114e55c7a 
								
							 
						 
						
							
							
								
								Fix   #323  - self-replies to appear in public timelines again  
							
							
							
						 
						
							2016-12-02 14:33:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								58b3f4fd67 
								
							 
						 
						
							
							
								
								Fix   #329  - avatar errors no longer prevent remote accounts from being saved  
							
							... 
							
							
							
							(without avatar). Also improved search position of exact matches 
							
						 
						
							2016-12-02 14:14:49 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								a21bcac9e1 
								
							 
						 
						
							
							
								
								Further abstract caching for includes  
							
							
							
						 
						
							2016-11-30 15:57:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8a4913fde0 
								
							 
						 
						
							
							
								
								Public and hashtag timelines now exclude reblogs and replies  
							
							... 
							
							
							
							Fix  #289  - don't download avatar unless the URL is http/https
Fix  #293  - reblog/reblogged is now boost/boosted 
						
							2016-11-26 15:45:35 +01:00