William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3b8e5bcbeb 
								
							 
						 
						
							
							
								
								fix most tests  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5d4a71906a 
								
							 
						 
						
							
							
								
								mastodon api: use Object.normalize() in a few missing spots  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e9b718cea2 
								
							 
						 
						
							
							
								
								mastodon api: status view: use Object.normalize()  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b70e5eae9 
								
							 
						 
						
							
							
								
								Parse bio for MastodonAPI  
							
							
							
						 
						
							2018-12-03 18:59:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								347df6421d 
								
							 
						 
						
							
							
								
								Fix masto api user updating.  
							
							
							
						 
						
							2018-12-01 10:40:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c443c9bd72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info  
							
							
							
						 
						
							2018-12-01 09:55:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02d3dc6869 
								
							 
						 
						
							
							
								
								Uploads fun, part. 2  
							
							
							
						 
						
							2018-11-30 18:02:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ec2812bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into validate-user-info  
							
							
							
						 
						
							2018-11-30 17:34:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d388a99143 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.MastodonSocket: Put access_token at function-level  
							
							
							
						 
						
							2018-11-24 06:43:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5346fabf14 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints  
							
							... 
							
							
							
							reported by soka on CRTNet 
							
						 
						
							2018-11-24 06:13:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc5cf2c192 
								
							 
						 
						
							
							
								
								Improved version string  
							
							
							
						 
						
							2018-11-20 17:55:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cf40237ff 
								
							 
						 
						
							
							
								
								MastodonAPI: Add pagination to private messages.  
							
							
							
						 
						
							2018-11-13 19:46:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KokaKiwi 
								
							 
						 
						
							
							
							
							
								
							
							
								1592fa2bea 
								
							 
						 
						
							
							
								
								Mastodon API: Fix list streaming  
							
							
							
						 
						
							2018-11-11 14:18:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b451a92d78 
								
							 
						 
						
							
							
								
								Merge branch 'runtime-config' into 'develop'  
							
							... 
							
							
							
							Runtime configuration
See merge request pleroma/pleroma!430  
							
						 
						
							2018-11-07 22:32:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e42f2efae4 
								
							 
						 
						
							
							
								
								/api/v1/accounts/relationships Return an empty array if no id in params  
							
							... 
							
							
							
							This copies Mastodon API behaviour & fixes Mastalab app. 
							
						 
						
							2018-11-07 16:32:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8f1e30cb8 
								
							 
						 
						
							
							
								
								Formatting.  
							
							
							
						 
						
							2018-11-06 16:05:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4f640c43ed 
								
							 
						 
						
							
							
								
								Unify Mastodon Login with OAuth login.  
							
							... 
							
							
							
							This removes duplication in the login code. 
							
						 
						
							2018-11-06 15:19:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								763fc7b44f 
								
							 
						 
						
							
							
								
								Runtime configured emojis  
							
							... 
							
							
							
							The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`. 
							
						 
						
							2018-11-05 13:24:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3e50bb667f 
								
							 
						 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable  
							
							
							
						 
						
							2018-11-03 14:42:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0cca7edbe0 
								
							 
						 
						
							
							
								
								Fix hashtag search  
							
							... 
							
							
							
							When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case. 
							
						 
						
							2018-11-02 19:38:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4d8f076125 
								
							 
						 
						
							
							
								
								mastodon api: add support for rendering Page objects  
							
							
							
						 
						
							2018-11-01 10:00:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								755f166406 
								
							 
						 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string  
							
							
							
						 
						
							2018-11-01 09:55:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								181f3bb56a 
								
							 
						 
						
							
							
								
								mastodon api: enforce upload limits for avatars and banners  
							
							
							
						 
						
							2018-10-29 16:43:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c6ec2d9fc 
								
							 
						 
						
							
							
								
								twitter/mastodon api: always use mediaproxy URLs in attachments  
							
							... 
							
							
							
							if using local media, the mediaproxy will not replace the URL anyway. 
							
						 
						
							2018-10-29 15:19:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								26eb11c172 
								
							 
						 
						
							
							
								
								activitypub: add support for filtering broken threads out of timelines  
							
							
							
						 
						
							2018-10-26 06:16:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b386888a0e 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4  
							
							... 
							
							
							
							Better be sure than sorry 
							
						 
						
							2018-10-25 06:21:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b112112c11 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4  
							
							
							
						 
						
							2018-10-25 05:52:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0a940d5a2 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments  
							
							
							
						 
						
							2018-10-25 05:24:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2da0ffeb28 
								
							 
						 
						
							
							
								
								lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil  
							
							
							
						 
						
							2018-10-25 05:24:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c10be8731 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json  
							
							
							
						 
						
							2018-10-25 05:24:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b0e9287a5 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views  
							
							
							
						 
						
							2018-10-25 05:24:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									AkiraFukushima 
								
							 
						 
						
							
							
							
							
								
							
							
								e8c698af41 
								
							 
						 
						
							
							
								
								Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs  
							
							
							
						 
						
							2018-10-19 01:46:26 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7b3fff9af8 
								
							 
						 
						
							
							
								
								{mastodon api, twitter api}: make the follow handshake timeout configurable  
							
							
							
						 
						
							2018-10-07 01:05:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7f530f6f80 
								
							 
						 
						
							
							
								
								mastodon api: relationship view: better handle no pre-existing follow activity  
							
							
							
						 
						
							2018-10-05 23:50:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e69faf550c 
								
							 
						 
						
							
							
								
								user: add wait_and_refresh() for async three-way handshake case  
							
							
							
						 
						
							2018-10-05 23:40:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3e751496e3 
								
							 
						 
						
							
							
								
								mastodon api: account view: fetch follow state and use it to populate requested field  
							
							
							
						 
						
							2018-10-05 23:31:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								df00a364fb 
								
							 
						 
						
							
							
								
								mastodon api: formatting  
							
							
							
						 
						
							2018-09-22 02:53:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								958e085acb 
								
							 
						 
						
							
							
								
								mastodon api: add support for user-supplied html policy  
							
							
							
						 
						
							2018-09-22 02:53:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40c51f118f 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0  
							
							
							
						 
						
							2018-09-20 16:48:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f74725df41 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables  
							
							
							
						 
						
							2018-09-20 16:37:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8eaecadee 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)  
							
							
							
						 
						
							2018-09-20 16:24:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43d0b7bf7a 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] add replies_count  
							
							
							
						 
						
							2018-09-20 16:10:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0cac493fdc 
								
							 
						 
						
							
							
								
								mastodon api: default attachment type to image if one is not present  
							
							
							
						 
						
							2018-09-19 04:59:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin Kühl 
								
							 
						 
						
							
							
							
							
								
							
							
								f4fcea5258 
								
							 
						 
						
							
							
								
								Revert "Mastodon API: Fake support for loading filters"  
							
							... 
							
							
							
							This reverts commit c1d07da4e16e030129fb 
							
						 
						
							2018-09-18 11:59:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c2650f0ffb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/html-scrub-policy' into 'develop'  
							
							... 
							
							
							
							html scrub policy
See merge request pleroma/pleroma!339  
							
						 
						
							2018-09-16 01:05:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								39aed5348a 
								
							 
						 
						
							
							
								
								Add visible_in_picker to status emojis  
							
							
							
						 
						
							2018-09-10 23:32:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac486fc59b 
								
							 
						 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly  
							
							
							
						 
						
							2018-09-10 00:14:47 +00:00