| 
								
								
									 eal | 7cb2e2971e | MastoAPI: fix dm_timeline getting non-create activities. | 2018-05-30 15:02:22 +03:00 |  | 
				
					
						| 
								
								
									 eal | 35cb8969c4 | MastoAPI: Fix link headers with restrictive params. | 2018-05-29 13:31:36 +03:00 |  | 
				
					
						| 
								
								
									 lain | 4b3ec53514 | Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api | 2018-05-26 16:00:59 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e80d91c64a | introduce User.maybe_direct_follow() and use it where we used to call User.follow() | 2018-05-25 09:40:10 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 502ba33d01 | activitypub: fix up accept/reject semantics for following fixes #175 | 2018-05-25 06:14:18 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c0ca9f82b9 | mastodon api: properly track if an account is locked or not | 2018-05-25 06:14:09 +00:00 |  | 
				
					
						| 
								
								
									 lambda | f3a71f2986 | Merge branch 'feature/lists' into 'develop' Mastodon List API
See merge request pleroma/pleroma!138 | 2018-05-24 20:22:43 +00:00 |  | 
				
					
						| 
								
								
									 lambda | c2dcd767cf | Merge branch 'feature/incoming-remote-unfollow' into 'develop' Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158 | 2018-05-24 19:52:24 +00:00 |  | 
				
					
						| 
								
								
									 eal | 3dbd9809d4 | MastoAPI: add lists. | 2018-05-24 15:34:39 +03:00 |  | 
				
					
						| 
								
								
									 eal | a8369db4f2 | MastoAPI: add lists. | 2018-05-24 13:18:39 +03:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | b2c6ae7d82 | Hook up unfollow and (un)block to MastoAPI + tests | 2018-05-22 04:27:40 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | 4fd9df100f | Merge branch 'develop' into feature/mstdn-direct-api | 2018-05-21 20:19:37 -04:00 |  | 
				
					
						| 
								
								
									 Thog | e55c6f311b | Migrate to comeonin 4 and Cachex 3 Also fix some warning in the code and add a missing alias | 2018-05-20 20:08:40 +02:00 |  | 
				
					
						| 
								
								
									 lain | 434601a5c3 | Return private / direct posts on user timelines, too. | 2018-05-20 16:15:18 +02:00 |  | 
				
					
						| 
								
								
									 Thog | 6f39ecc41b | Support Undo like activities (Fix #139) | 2018-05-19 22:14:15 +02:00 |  | 
				
					
						| 
								
								
									 csaurus | 2ce48c1a42 | Formatting | 2018-05-13 15:36:41 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | 9aabff4883 | Fix tests. | 2018-05-13 15:33:59 -04:00 |  | 
				
					
						| 
								
								
									 lambda | aeff2d6474 | Merge branch 'feature/unrepeats' into 'develop' Add unrepeats
Closes #69
See merge request pleroma/pleroma!113 | 2018-05-13 09:32:29 +00:00 |  | 
				
					
						| 
								
								
									 csaurus | c8d418acdd | api/v1/timelines/direct implementation | 2018-05-12 21:50:59 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | c60a5405db | Detect and try to stream incoming "direct" messages | 2018-05-12 17:40:59 -04:00 |  | 
				
					
						| 
								
								
									 lambda | 6c2903d9a1 | Merge branch 'feld-warnings' into 'develop' Clean up warnings
See merge request pleroma/pleroma!144 | 2018-05-06 18:42:31 +00:00 |  | 
				
					
						| 
								
								
									 eal | bfad57c7c9 | Get rid of unsafe variables. | 2018-05-06 09:58:59 +03:00 |  | 
				
					
						| 
								
								
									 lain | 96add86b50 | Unify wss uri generation. | 2018-05-05 13:40:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | c464355d1a | Idempotency: Use special cache, keep for 6 hours. | 2018-05-05 11:15:57 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 31ea9cbcd8 | Group def renders together to fix warning | 2018-05-04 22:28:13 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | aaacebd906 | Fix unused variables, imports, and aliases | 2018-05-04 21:42:20 +00:00 |  | 
				
					
						| 
								
								
									 lain | 90c4bed0af | Don't expire idempotency cache for five minutes. | 2018-05-04 21:15:39 +02:00 |  | 
				
					
						| 
								
								
									 lain | fcd3eca167 | MastodonAPI: Support idempotency key. | 2018-05-04 20:30:29 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 9e0dd21ed6 | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats | 2018-04-25 00:46:28 -04:00 |  | 
				
					
						| 
								
								
									 lain | ff5e957476 | Make search use id index too. Seems to be faster in general, query planner chooses well. | 2018-04-21 09:22:31 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | c5dc7e6e31 | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats | 2018-04-20 16:48:18 -04:00 |  | 
				
					
						| 
								
								
									 lain | a61e8ac154 | Formatting. | 2018-04-20 13:10:57 +02:00 |  | 
				
					
						| 
								
								
									 eal | 947431e9aa | MastoAPI and OAuth: allow login with either email or username. | 2018-04-18 13:13:57 +03:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 7b4f55238e | Handle unrepeats via the TwitterAPI | 2018-04-18 06:00:40 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 687db1bc3a | Expose unannounce activity so that it can be tested | 2018-04-18 03:39:42 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 42279f54cf | Return target status in MastoAPI endpoint instead of reblog activity | 2018-04-16 23:30:52 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | b949577472 | Add unrepeat functionality | 2018-04-14 20:19:48 -04:00 |  | 
				
					
						| 
								
								
									 Gian Sass | 907df9b8ed | Fix issue #124 | 2018-04-11 14:55:49 -04:00 |  | 
				
					
						| 
								
								
									 lain | 1dd2c8163f | Order masto searches by date. | 2018-04-10 18:38:52 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 9998b4519d | Merge branch 'feature/mastodon-api-for-tootstream' into 'develop' mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100 | 2018-04-08 06:02:11 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 9a2d3705c6 | Merge branch 'fix/persisted-mastofe-settings' into 'develop' MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98 | 2018-04-08 06:01:06 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1857f403be | mastodon api: report version as the Mastodon API version supported with the real version in parenthesis | 2018-04-07 17:29:28 -05:00 |  | 
				
					
						| 
								
								
									 lain | 70bcdf32bd | Only search in public data for now. This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. | 2018-04-07 16:40:45 +02:00 |  | 
				
					
						| 
								
								
									 eal | 7c47534970 | MastoAPI: Persist frontend timelines and settings. | 2018-04-07 17:26:56 +03:00 |  | 
				
					
						| 
								
								
									 lain | 303289d7da | MastodonAPI search: return only create activities. | 2018-04-05 13:59:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +02:00 |  | 
				
					
						| 
								
								
									 Morgan Bazalgette | 5e4bb4ad92 | masto api: run emojis through mediaproxy fixes #107 | 2018-04-02 12:04:11 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2dcc6037d0 | mastodon search api: implement a reasonable hashtags stub | 2018-04-01 02:12:10 -05:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  | 
				
					
						| 
								
								
									 Morgan Bazalgette | 457e040473 | Add char_limit to initial-state of mastofe | 2018-03-30 00:59:49 +02:00 |  |