| 
								
								
									 eal | b3e7d7ae6d | Fetch external profile in the background. | 2018-01-16 15:31:03 +02:00 |  | 
				
					
						| 
								
								
									 eal | 80f6ac412a | Merge branch 'default-pictures' into 'develop' Add a default profile picture and banner.
See merge request pleroma/pleroma!48 | 2018-01-15 20:26:49 +00:00 |  | 
				
					
						| 
								
								
									 eal | 14b086eec2 | Add a default profile picture and banner. This removes the placehold.it dependency. | 2018-01-15 22:18:17 +02:00 |  | 
				
					
						| 
								
								
									 eal | 6e1cb86166 | Fix instance test. | 2018-01-14 08:28:35 +02:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 2a744cdff8 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-12-19 16:15:45 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | f1f79c0dca | Fix timelines in subway tooter. | 2017-12-19 16:15:07 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 29c9812789 | Merge branch 'fix/twitterapi-follow-lists' into 'develop' Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41 | 2017-12-18 22:44:15 +00:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 47887ac848 | MastoAPI: Fix always-sensitive bugs. | 2017-12-18 16:56:03 +01:00 |  | 
				
					
						| 
								
								
									 eal | 1969773fb4 | Fix follower/following lists. Add tests. | 2017-12-18 16:37:26 +02:00 |  | 
				
					
						| 
								
								
									 eal | 9223038319 | Fix some more tests. | 2017-12-11 21:01:36 +02:00 |  | 
				
					
						| 
								
								
									 eal | 79b3397c17 | Fix tests. | 2017-12-11 18:41:03 +02:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 66c3813ea6 | Add basic queue prioritization. | 2017-12-05 18:21:30 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | e7c2472abd | Fix tests. | 2017-12-05 12:18:04 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d08a34e88b | OStatus: Add user bio as summary field Fixes problem with bio federation. | 2017-12-03 13:34:17 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 5637d163e6 | MastodonAPI: Add proper user count. | 2017-11-30 14:59:44 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | c680ae581d | Return xml notice at /notice path. | 2017-11-27 17:24:52 +01:00 |  | 
				
					
						| 
								
								
									 eal | 3d29fc5462 | Make /api/friends/ids test deterministic. | 2017-11-20 19:16:43 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 747a68a075 | Treat internal emoji like external. | 2017-11-20 17:53:21 +01:00 |  | 
				
					
						| 
								
								
									 eal | edc3e5bc30 | Make users in tests follow themselves by default. Also fix the semantics of all tests to match. | 2017-11-20 07:52:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 40ca379357 | Fix flakey test. | 2017-11-19 13:07:29 +01:00 |  | 
				
					
						| 
								
								
									 lambda | ed3403ad8b | Merge branch 'formatting-fixes' into 'develop' Formatting fixes
Closes #80
See merge request pleroma/pleroma!22 | 2017-11-18 15:58:44 +00:00 |  | 
				
					
						| 
								
								
									 eal | f53cdabcdf | Add #nsfw tag if sensitive content bit is set | 2017-11-18 16:30:18 +02:00 |  | 
				
					
						| 
								
								
									 eal | fb118b2978 | Don't insert newlines to generated HTML. MastoFE doesn't like them. | 2017-11-18 14:46:54 +02:00 |  | 
				
					
						| 
								
								
									 eal | 66e78c3ec4 | Escape HTML instead of discarding it. | 2017-11-18 14:43:41 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ced0d64d75 | MastoAPI: Make attachment ids strings. | 2017-11-15 18:58:39 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 1cca544e20 | Merge branch 'twitterapi-bitlbee' into 'develop' TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18 | 2017-11-14 16:47:54 +00:00 |  | 
				
					
						| 
								
								
									 eal | f9828e578c | TwitterAPI: Add /users/show. | 2017-11-14 17:34:48 +02:00 |  | 
				
					
						| 
								
								
									 eal | 3533bf7eac | TwitterAPI: Add /friends/ids. | 2017-11-14 16:04:58 +02:00 |  | 
				
					
						| 
								
								
									 eal | 06c3ee3bac | Accept 1 as true. | 2017-11-14 15:54:50 +02:00 |  | 
				
					
						| 
								
								
									 eal | c84723b679 | MastoAPI: Add media timelines. | 2017-11-14 15:41:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 083cd169d2 | MastoAPI: Fix repeat api bug. Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status. | 2017-11-13 09:48:56 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 08bc316742 | Merge branch 'mastodon-notification-endpoints' into 'develop' MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13 | 2017-11-12 11:08:06 +00:00 |  | 
				
					
						| 
								
								
									 lambda | efcf54dc02 | Merge branch 'mastoapi-update-credentials' into 'develop' MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15 | 2017-11-12 09:24:32 +00:00 |  | 
				
					
						| 
								
								
									 eal | fc7483cb3c | MastoAPI: Add update credentials endpoint. | 2017-11-12 00:27:09 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a1923d20e8 | MastoAPI: Fix reblog emojis. | 2017-11-11 11:18:05 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1d3d66a841 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-11-10 17:37:54 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6e9c22c0af | MastoAPI: Use string ids everywhere. | 2017-11-10 17:18:19 +01:00 |  | 
				
					
						| 
								
								
									 eal | e6a78c6ed0 | MastoAPI: Add notification get, clear and dismiss. | 2017-11-10 15:24:52 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 266d9c008d | MastoAPI: Fetch statuses in search. | 2017-11-09 16:48:45 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f1d27a5fbb | Add actor column to activities. | 2017-11-09 10:41:19 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 41b8a76e96 | Re-fetch user data on salmon decode error. | 2017-11-09 08:32:54 +01:00 |  | 
				
					
						| 
								
								
									 eal | f7fc048aeb | TwitterAPI user view: add follows_you. | 2017-11-08 19:13:03 +02:00 |  | 
				
					
						| 
								
								
									 eal | 4656cb9b99 | TwitterAPI user view: add blocks. | 2017-11-08 13:02:00 +02:00 |  | 
				
					
						| 
								
								
									 eal | 6c0758e041 | TwitterAPI: Add blocks. | 2017-11-08 00:04:53 +02:00 |  | 
				
					
						| 
								
								
									 eal | f85566324e | Allow profile fetching for authenticated users only. | 2017-11-07 00:33:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7252f6b054 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-11-05 12:12:19 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 046bee34d3 | Fix bug when no posts are in the db. | 2017-11-05 12:11:59 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c6b9b777da | MastoAPI: Add list of blocked users. | 2017-11-03 08:51:17 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5bf92e50be | MastoAPI: Add blocking. | 2017-11-03 08:38:05 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 33beb51da4 | MastoAPI: Add blocking to AccountView. | 2017-11-03 08:23:31 +01:00 |  |