eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2d1a5e9c4
								
							
						 | 
						
							
							
								
								MastoAPI AccountView: render profile emoji.
							
							
							
							
							
						 | 
						
							2018-08-07 21:56:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd19d37a90
								
							
						 | 
						
							
							
								
								mastodon api: use object name as alt text
							
							
							
							
							
						 | 
						
							2018-07-17 03:40:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a922305af
								
							
						 | 
						
							
							
								
								Merge branch 'feature/article-support' into 'develop'
							
							
							
							
							
							
							
							article support (plume, etc)
See merge request pleroma/pleroma!240 
							
						 | 
						
							2018-07-12 05:58:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7a351cb36f
								
							
						 | 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/231 
							
						 | 
						
							2018-07-12 01:57:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								971bb4f2bd
								
							
						 | 
						
							
							
								
								activity interpretation: formatting
							
							
							
							
							
						 | 
						
							2018-06-27 13:38:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea982e7503
								
							
						 | 
						
							
							
								
								mastodon api: add interpreter for Article activity types
							
							
							
							
							
						 | 
						
							2018-06-27 13:38:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b
								
							
						 | 
						
							
							
								
								Fake 2.4.0 API
							
							
							
							
							
						 | 
						
							2018-06-23 16:12:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72c2915ecd
								
							
						 | 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
							
							
							
							
							
						 | 
						
							2018-06-15 22:14:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3ec53514
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
							
							
							
							
							
						 | 
						
							2018-05-26 16:00:59 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8369db4f2
								
							
						 | 
						
							
							
								
								MastoAPI: add lists.
							
							
							
							
							
						 | 
						
							2018-05-24 13:18:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									csaurus
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ce48c1a42
								
							
						 | 
						
							
							
								
								Formatting
							
							
							
							
							
						 | 
						
							2018-05-13 15:36:41 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									csaurus
								
							 
						 | 
						
							
							
							
							
								
							
							
								9aabff4883
								
							
						 | 
						
							
							
								
								Fix tests.
							
							
							
							
							
						 | 
						
							2018-05-13 15:33:59 -04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Morgan Bazalgette
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5e4bb4ad92
								
							
						 | 
						
							
							
								
								masto api: run emojis through mediaproxy
							
							
							
							
							
							
							
							fixes #107 
							
						 | 
						
							2018-04-02 12:04:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								37e5014d3e
								
							
						 | 
						
							
							
								
								Reduce OP fetching queries.
							
							
							
							
							
						 | 
						
							2018-03-27 18:18:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff7afe46b9
								
							
						 | 
						
							
							
								
								Don't try to fetch OP if none is there.
							
							
							
							
							
						 | 
						
							2018-03-27 17:43:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								09de76ad5a
								
							
						 | 
						
							
							
								
								Return "audio" info in mastodon api.
							
							
							
							
							
						 | 
						
							2018-03-25 17:08:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbe9aa3506
								
							
						 | 
						
							
							
								
								Strip html from emoji stuff.
							
							
							
							
							
						 | 
						
							2018-03-23 19:52:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								000b3f1837
								
							
						 | 
						
							
							
								
								mastodon api: fix rendering the mentions JSON
							
							
							
							
							
							
							
							Signed-off-by: lain <lain@soykaf.club> 
							
						 | 
						
							2018-03-16 11:25:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								95e6e82138
								
							
						 | 
						
							
							
								
								Correctly display accounts without name.
							
							
							
							
							
						 | 
						
							2018-02-22 19:22:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								486e205810
								
							
						 | 
						
							
							
								
								Remove some noise.
							
							
							
							
							
						 | 
						
							2018-02-20 08:52:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4b08dd838
								
							
						 | 
						
							
							
								
								MastodonAPI: Post with visibility settings
							
							
							
							
							
						 | 
						
							2018-02-18 14:56:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								539340d914
								
							
						 | 
						
							
							
								
								Handle sensitive property.
							
							
							
							
							
						 | 
						
							2018-02-18 14:14:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								912ca56e59
								
							
						 | 
						
							
							
								
								Mastodon StatusView: Return correct visibility.
							
							
							
							
							
						 | 
						
							2018-02-18 13:51:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								14b086eec2
								
							
						 | 
						
							
							
								
								Add a default profile picture and banner.
							
							
							
							
							
							
							
							This removes the placehold.it dependency. 
							
						 | 
						
							2018-01-15 22:18:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5f35fdcf5d
								
							
						 | 
						
							
							
								
								media proxy: good enough wip
							
							
							
							
							
						 | 
						
							2017-11-28 20:50:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa19de97ba
								
							
						 | 
						
							
							
								
								MastoAPI: no more than 4 attachments.
							
							
							
							
							
						 | 
						
							2017-11-20 22:49:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c
								
							
						 | 
						
							
							
								
								Fix all compilation warnings
							
							
							
							
							
						 | 
						
							2017-11-19 02:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ced0d64d75
								
							
						 | 
						
							
							
								
								MastoAPI: Make attachment ids strings.
							
							
							
							
							
						 | 
						
							2017-11-15 18:58:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d293ceb1b5
								
							
						 | 
						
							
							
								
								Add Mastodon frontend.
							
							
							
							
							
						 | 
						
							2017-11-12 14:23:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1923d20e8
								
							
						 | 
						
							
							
								
								MastoAPI: Fix reblog emojis.
							
							
							
							
							
						 | 
						
							2017-11-11 11:18:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e9c22c0af
								
							
						 | 
						
							
							
								
								MastoAPI: Use string ids everywhere.
							
							
							
							
							
						 | 
						
							2017-11-10 17:18:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								33beb51da4
								
							
						 | 
						
							
							
								
								MastoAPI: Add blocking to AccountView.
							
							
							
							
							
						 | 
						
							2017-11-03 08:23:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								44295dd49a
								
							
						 | 
						
							
							
								
								MastoAPI: Include CW.
							
							
							
							
							
						 | 
						
							2017-10-31 17:49:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								968a546d4a
								
							
						 | 
						
							
							
								
								MastoAPI: Return id as string instead of integer.
							
							
							
							
							
						 | 
						
							2017-10-31 14:51:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce7f9f527c
								
							
						 | 
						
							
							
								
								MastoAPI: Always return an url for statuses.
							
							
							
							
							
							
							
							External url if available, id if not. 
							
						 | 
						
							2017-10-31 14:40:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								64bc38e009
								
							
						 | 
						
							
							
								
								MastoAPI: Add emoji output.
							
							
							
							
							
						 | 
						
							2017-10-23 16:27:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae38b72e24
								
							
						 | 
						
							
							
								
								MastoAPI: Fix reblog view.
							
							
							
							
							
						 | 
						
							2017-09-17 14:25:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6000f61727
								
							
						 | 
						
							
							
								
								MastoAPI: Add repeats to statusview.
							
							
							
							
							
						 | 
						
							2017-09-17 13:54:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0872f5f394
								
							
						 | 
						
							
							
								
								Add undocumented default user default settings.
							
							
							
							
							
						 | 
						
							2017-09-16 11:52:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d659fcc195
								
							
						 | 
						
							
							
								
								MastoAPI: Fix date in account view.
							
							
							
							
							
						 | 
						
							2017-09-15 17:50:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aaf6608c6
								
							
						 | 
						
							
							
								
								MastoAPI: Set user id on replies.
							
							
							
							
							
						 | 
						
							2017-09-15 08:49:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0363e8055
								
							
						 | 
						
							
							
								
								MastoAPI: Add favourited_by/reblogged_by.
							
							
							
							
							
						 | 
						
							2017-09-14 09:50:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8701282d4
								
							
						 | 
						
							
							
								
								MastoAPI: fake out 'application' property.
							
							
							
							
							
						 | 
						
							2017-09-14 09:14:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6258c6b6b3
								
							
						 | 
						
							
							
								
								MastoAPI: Also return text_url in attachments.
							
							
							
							
							
						 | 
						
							2017-09-14 08:38:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3184939055
								
							
						 | 
						
							
							
								
								Ensure non-null bio.
							
							
							
							
							
						 | 
						
							2017-09-13 17:45:59 +02:00 | 
						
						
							
							
							
								
							
							
						 |