lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93f2dc19d9 
								
							 
						 
						
							
							
								
								TwitterAPI: Fix banner and background update.  
							
							
							
						 
						
							2018-12-01 12:01:22 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d407f662af 
								
							 
						 
						
							
							
								
								Fix TwitterApiController.  
							
							
							
						 
						
							2018-11-30 17:07:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a6812bc9df 
								
							 
						 
						
							
							
								
								Remove "most recent notification" endpoint.  
							
							
							
						 
						
							2018-11-30 16:47:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc5cf2c192 
								
							 
						 
						
							
							
								
								Improved version string  
							
							
							
						 
						
							2018-11-20 17:55:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fbb70d25fe 
								
							 
						 
						
							
							
								
								Several twitter api fixes.  
							
							
							
						 
						
							2018-11-18 22:36:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f87b315618 
								
							 
						 
						
							
							
								
								TwitterAPI: Fix dm_timeline displaying only half of the conversation.  
							
							
							
						 
						
							2018-11-16 19:47:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7b170cd616 
								
							 
						 
						
							
							
								
								Add Pleroma user search api for PleromaFE.  
							
							
							
						 
						
							2018-11-14 20:33:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ea9a776d7b 
								
							 
						 
						
							
							
								
								TwitterApi: Add direct message endpoint  
							
							
							
						 
						
							2018-11-13 20:08:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								cb6fd73861 
								
							 
						 
						
							
							
								
								Twitter API: Fall back to user.nickname if user has no name  
							
							
							
						 
						
							2018-11-12 15:52:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								4d627a5117 
								
							 
						 
						
							
							
								
								Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'  
							
							... 
							
							
							
							qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431  
							
						 
						
							2018-11-07 22:33:06 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b2105a3131 
								
							 
						 
						
							
							
								
								twitterapi: add notification read endpoint  
							
							
							
						 
						
							2018-11-06 23:25:07 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f3e78addb 
								
							 
						 
						
							
							
								
								Merge branch 'runtime-router' into 'develop'  
							
							... 
							
							
							
							Runtime configured router
See merge request pleroma/pleroma!426  
							
						 
						
							2018-11-06 15:35:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								013f7ba8c1 
								
							 
						 
						
							
							
								
								Add federating plug & public tests  
							
							
							
						 
						
							2018-11-06 14:45:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fe23c5458 
								
							 
						 
						
							
							
								
								Runtime configured router  
							
							
							
						 
						
							2018-11-05 15:19:03 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c7d4ff271 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo  
							
							
							
						 
						
							2018-11-01 15:07:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								24ba08de13 
								
							 
						 
						
							
							
								
								twitter api: add support for rendering Page objects  
							
							
							
						 
						
							2018-11-01 10:01:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e12489e2fe 
								
							 
						 
						
							
							
								
								twitter api: enforce upload limits for avatars, banners and backgrounds  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed25c963a 
								
							 
						 
						
							
							
								
								twitterapi: activity view: add the other in_reply_to fields  
							
							
							
						 
						
							2018-10-25 04:04:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fee43ae5e7 
								
							 
						 
						
							
							
								
								twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper  
							
							
							
						 
						
							2018-10-25 02:59:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								a253c1466e 
								
							 
						 
						
							
							
								
								New frontend options  
							
							
							
						 
						
							2018-10-21 12:52:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								7562912f6a 
								
							 
						 
						
							
							
								
								Use maybe_direct_follow for follow imports  
							
							
							
						 
						
							2018-10-17 04:16:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7b3fff9af8 
								
							 
						 
						
							
							
								
								{mastodon api, twitter api}: make the follow handshake timeout configurable  
							
							
							
						 
						
							2018-10-07 01:05:59 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								16307da311 
								
							 
						 
						
							
							
								
								twitterapi: frontend config: add formattingOptionsEnabled  
							
							
							
						 
						
							2018-10-05 20:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b1be9415ef 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-a26d5e6b' into 'develop'"  
							
							... 
							
							
							
							This reverts commit d31bbb1cfe340ab3cb90 
							
						 
						
							2018-10-05 20:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82b57ebad1 
								
							 
						 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"  
							
							
							
						 
						
							2018-09-28 10:44:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								56577d8b48 
								
							 
						 
						
							
							
								
								twitter api: add no_rich_text option to userview for account prefs  
							
							
							
						 
						
							2018-09-22 03:24:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c2b69798dd 
								
							 
						 
						
							
							
								
								twitter api: add support for disabling rich text  
							
							
							
						 
						
							2018-09-22 02:53:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2f5b026548 
								
							 
						 
						
							
							
								
								twitter api: add support for user-specified html policy  
							
							
							
						 
						
							2018-09-22 02:53:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c9585ec007 
								
							 
						 
						
							
							
								
								twitter api: fix mimetype fallback when attachments use a URI instead of a URL object  
							
							
							
						 
						
							2018-09-19 04:59:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e82ce2a4b3 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-09-10 00:28:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ac486fc59b 
								
							 
						 
						
							
							
								
								everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly  
							
							
							
						 
						
							2018-09-10 00:14:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								b7923aa304 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix_broken_likes' into 'develop'  
							
							... 
							
							
							
							hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284  
							
						 
						
							2018-09-02 12:37:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e2ce0e9e05 
								
							 
						 
						
							
							
								
								run mix format.  
							
							
							
						 
						
							2018-09-01 21:12:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c921d99898 
								
							 
						 
						
							
							
								
								config: add ability to disable Pleroma FE config management ( closes   #276 )  
							
							
							
						 
						
							2018-09-01 21:05:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								58539e1357 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/rich-text' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !309  
							
						 
						
							2018-08-31 09:51:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								856b5e1ca4 
								
							 
						 
						
							
							
								
								config: chase pleroma-fe updates from MR pleroma-fe!324.  
							
							
							
						 
						
							2018-08-31 04:01:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa65b68b8 
								
							 
						 
						
							
							
								
								common api: add support for formatting messages outside of twitter-style plain text  
							
							
							
						 
						
							2018-08-31 03:13:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								0f1c629d65 
								
							 
						 
						
							
							
								
								better solution, added test.  
							
							
							
						 
						
							2018-08-27 17:07:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								946a0769c4 
								
							 
						 
						
							
							
								
								remove unused settings from /api/statusnet/config  
							
							
							
						 
						
							2018-08-26 17:40:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aab2bdddf4 
								
							 
						 
						
							
							
								
								twitter api: provide object descriptions as attachment description field  
							
							
							
						 
						
							2018-08-25 00:12:58 +00:00