href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fbb70d25fe 
								
							 
						 
						
							
							
								
								Several twitter api fixes.  
							
							
							
						 
						
							2018-11-18 22:36:47 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8c0c930041 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-08-12 19:42:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ffd9ad1f0c 
								
							 
						 
						
							
							
								
								Fix for elixir 1.7.  
							
							
							
						 
						
							2018-08-12 18:41:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								13440a80e1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'  
							
							... 
							
							
							
							Invites
Closes  #108 
See merge request pleroma/pleroma!208  
							
						 
						
							2018-08-12 12:04:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1555c66650 
								
							 
						 
						
							
							
								
								Add unretweet TwAPI endpoint and cleanup AP.unannounce  
							
							
							
						 
						
							2018-06-13 21:33:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								9c1cf1befb 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-06-12 15:01:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								f42ffbe9a8 
								
							 
						 
						
							
							
								
								Initial invites support + tests.  
							
							
							
						 
						
							2018-06-12 14:55:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f70e83e8c 
								
							 
						 
						
							
							
								
								Better error handling in TwitterApiController.  
							
							
							
						 
						
							2018-06-03 19:11:22 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								c89b90222c 
								
							 
						 
						
							
							
								
								twitter api: also remove explicit User.follow here  
							
							
							
						 
						
							2018-05-25 09:40:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								72b93d13f8 
								
							 
						 
						
							
							
								
								Hook up block/unblock to TwitterAPI  
							
							
							
						 
						
							2018-05-22 05:41:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								55f9aefd08 
								
							 
						 
						
							
							
								
								Hook unfollow into TwitterAPI  
							
							
							
						 
						
							2018-05-22 04:49:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f39ecc41b 
								
							 
						 
						
							
							
								
								Support Undo like activities ( Fix   #139 )  
							
							
							
						 
						
							2018-05-19 22:14:15 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0df1a4efc8 
								
							 
						 
						
							
							
								
								Fix comment grammar  
							
							
							
						 
						
							2018-04-25 00:46:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								7b4f55238e 
								
							 
						 
						
							
							
								
								Handle unrepeats via the TwitterAPI  
							
							
							
						 
						
							2018-04-18 06:00:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								85bd191291 
								
							 
						 
						
							
							
								
								Remove unretweet function for now  
							
							
							
						 
						
							2018-04-17 04:12:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								b949577472 
								
							 
						 
						
							
							
								
								Add unrepeat functionality  
							
							
							
						 
						
							2018-04-14 20:19:48 -04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								360c51f1f5 
								
							 
						 
						
							
							
								
								Use context_ids directly if we have them.  
							
							
							
						 
						
							2018-04-02 15:28:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								802736679c 
								
							 
						 
						
							
							
								
								Remove unused ActivityRepresenter module.  
							
							
							
						 
						
							2018-03-30 16:50:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7ab94ae22d 
								
							 
						 
						
							
							
								
								TwitterApiController: Use ActivityView.  
							
							
							
						 
						
							2018-03-30 16:30:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d2099c849d 
								
							 
						 
						
							
							
								
								More Jason changes.  
							
							
							
						 
						
							2018-03-27 16:45:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								847cb15626 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2018-03-24 15:09:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7be7a9454 
								
							 
						 
						
							
							
								
								Unify user fetching.  
							
							
							
						 
						
							2018-03-24 15:02:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a17ba0ee0d 
								
							 
						 
						
							
							
								
								Only return posts in TwAPI user view.  
							
							
							
						 
						
							2018-02-26 09:02:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4ea2a41014 
								
							 
						 
						
							
							
								
								Fix more specs.  
							
							
							
						 
						
							2018-02-25 17:48:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								947ba6495d 
								
							 
						 
						
							
							
								
								More TwAPI fixes.  
							
							
							
						 
						
							2018-02-21 10:31:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								391b3e3586 
								
							 
						 
						
							
							
								
								TwitterAPI: Fix some bugz.  
							
							
							
						 
						
							2018-02-21 08:16:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1633470e4a 
								
							 
						 
						
							
							
								
								TwitterAPI: Only fetch creates, announces, follows.  
							
							
							
						 
						
							2018-02-19 09:50:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								010f818a29 
								
							 
						 
						
							
							
								
								Fix conversations.  
							
							
							
						 
						
							2018-02-18 20:52:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5d89997a70 
								
							 
						 
						
							
							
								
								Respect visibility in API.  
							
							
							
						 
						
							2018-02-18 15:50:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c974f6544f 
								
							 
						 
						
							
							
								
								Show users their own posts in timeline.  
							
							
							
						 
						
							2018-02-18 15:20:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								b3e7d7ae6d 
								
							 
						 
						
							
							
								
								Fetch external profile in the background.  
							
							
							
						 
						
							2018-01-16 15:31:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c 
								
							 
						 
						
							
							
								
								Fix all compilation warnings  
							
							
							
						 
						
							2017-11-19 02:22:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								6c0758e041 
								
							 
						 
						
							
							
								
								TwitterAPI: Add blocks.  
							
							
							
						 
						
							2017-11-08 00:04:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d89a7a0b34 
								
							 
						 
						
							
							
								
								TwitterAPI: Add blocking to fetches.  
							
							
							
						 
						
							2017-11-02 22:50:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								b7b3e3f263 
								
							 
						 
						
							
							
								
								Use inserted_at as sort in search.  
							
							
							
						 
						
							2017-09-17 11:32:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								03952a2760 
								
							 
						 
						
							
							
								
								Sort by updated_at  
							
							... 
							
							
							
							the updated_at column isn't indexed, so postgres won't take the wrong index. 
							
						 
						
							2017-09-16 14:51:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								f039c9c19a 
								
							 
						 
						
							
							
								
								Don't specify order in results for now.  
							
							
							
						 
						
							2017-09-16 14:40:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5d1f8dcd1c 
								
							 
						 
						
							
							
								
								TwitterAPI: Add search.  
							
							
							
						 
						
							2017-09-16 14:33:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								50409326a8 
								
							 
						 
						
							
							
								
								Refactor posting and make character limit configurable.  
							
							
							
						 
						
							2017-09-15 14:17:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d625d8db7d 
								
							 
						 
						
							
							
								
								Add unfav to Mastodon API.  
							
							
							
						 
						
							2017-09-09 18:30:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								454dc18570 
								
							 
						 
						
							
							
								
								Add favoriting to Mastodon API.  
							
							
							
						 
						
							2017-09-09 18:09:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								66e4c710d4 
								
							 
						 
						
							
							
								
								Add reblogging to MastodonAPI.  
							
							
							
						 
						
							2017-09-09 17:48:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								632e1f7943 
								
							 
						 
						
							
							
								
								Add delete to TwAPI representer correctly.  
							
							
							
						 
						
							2017-09-04 20:48:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1a001588e8 
								
							 
						 
						
							
							
								
								Don't break on empty mentions.  
							
							
							
						 
						
							2017-08-24 12:54:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								72ca58c540 
								
							 
						 
						
							
							
								
								Save follower count and note count in user.  
							
							
							
						 
						
							2017-07-22 17:42:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								140f72725d 
								
							 
						 
						
							
							
								
								Use follower address in user entry.  
							
							
							
						 
						
							2017-07-19 19:06:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1e6491ec96 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/user-view  
							
							
							
						 
						
							2017-06-20 11:49:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								af49c11193 
								
							 
						 
						
							
							
								
								Work around upserting problems in context mapping.  
							
							
							
						 
						
							2017-06-20 09:50:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								069daf644d 
								
							 
						 
						
							
							
								
								Replace UserRepresenter with UserView  
							
							
							
						 
						
							2017-06-20 00:12:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d00571ff75 
								
							 
						 
						
							
							
								
								Fetch user feed on externalprofile request.  
							
							... 
							
							
							
							This is so we always have something to show. 
							
						 
						
							2017-06-18 17:20:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1af9c77736 
								
							 
						 
						
							
							
								
								Move mention parsing to Formatter module.  
							
							
							
						 
						
							2017-06-14 13:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								eb18b9ebba 
								
							 
						 
						
							
							
								
								Enable user timelines.  
							
							
							
						 
						
							2017-06-12 17:12:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								0da6ade619 
								
							 
						 
						
							
							
								
								Save tags in object.  
							
							
							
						 
						
							2017-05-18 15:16:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9033bfffd2 
								
							 
						 
						
							
							
								
								Twitter API refactoring.  
							
							
							
						 
						
							2017-05-17 18:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								70024632ba 
								
							 
						 
						
							
							
								
								AP refactoring.  
							
							
							
						 
						
							2017-05-16 18:19:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								423194520e 
								
							 
						 
						
							
							
								
								Fix mention replacing.  
							
							
							
						 
						
							2017-05-15 18:25:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								04544da8f1 
								
							 
						 
						
							
							
								
								Fetch user on externalprofile if we don't know him  
							
							
							
						 
						
							2017-05-12 18:50:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								36448d6483 
								
							 
						 
						
							
							
								
								Add externalprofile to TwAPI.  
							
							
							
						 
						
							2017-05-10 18:44:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1418d72749 
								
							 
						 
						
							
							
								
								Add class=attachment to attachment links.  
							
							
							
						 
						
							2017-05-08 20:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								b403ea4d2b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity  
							
							
							
						 
						
							2017-05-07 19:28:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a41aa4e489 
								
							 
						 
						
							
							
								
								Federate follow salmons.  
							
							
							
						 
						
							2017-05-07 14:45:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								7269c51f3a 
								
							 
						 
						
							
							
								
								Some refactoring.  
							
							
							
						 
						
							2017-05-05 12:07:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								33c803d6da 
								
							 
						 
						
							
							
								
								Add attachment link to posts.  
							
							
							
						 
						
							2017-05-02 18:25:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								32a95d73da 
								
							 
						 
						
							
							
								
								Add twkn timeline.  
							
							
							
						 
						
							2017-05-02 14:12:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								3cb518270a 
								
							 
						 
						
							
							
								
								Remove superfluous transaction.  
							
							
							
						 
						
							2017-05-01 16:15:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								f169de3454 
								
							 
						 
						
							
							
								
								Cache objects in dev and prod.  
							
							
							
						 
						
							2017-05-01 16:12:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								09f7ed4214 
								
							 
						 
						
							
							
								
								Don't set statusnetConversationIds on replies anymore.  
							
							
							
						 
						
							2017-04-30 14:26:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								379caca01d 
								
							 
						 
						
							
							
								
								Wrap context creation in transaction.  
							
							
							
						 
						
							2017-04-30 13:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4c8111c334 
								
							 
						 
						
							
							
								
								Use conversation mapping objects to get / retrieve context from TwAPI.  
							
							
							
						 
						
							2017-04-30 13:53:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								a9b2ad1759 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity  
							
							
							
						 
						
							2017-04-28 16:06:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								e8882ab3da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/incoming_ostatus  
							
							
							
						 
						
							2017-04-26 09:18:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								b438ea24ee 
								
							 
						 
						
							
							
								
								Add ostatus conversation as context.  
							
							
							
						 
						
							2017-04-25 17:45:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6c5f5e18ec 
								
							 
						 
						
							
							
								
								Even more refactoring.  
							
							
							
						 
						
							2017-04-25 17:36:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4771962a5d 
								
							 
						 
						
							
							
								
								More refactoring.  
							
							
							
						 
						
							2017-04-25 17:32:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ef4190b3ab 
								
							 
						 
						
							
							
								
								Clean up status create method.  
							
							
							
						 
						
							2017-04-25 17:26:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ab0114fbaa 
								
							 
						 
						
							
							
								
								Return salmon path for users, basic incoming salmon handling.  
							
							
							
						 
						
							2017-04-24 18:46:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambadalambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a3b9741a62 
								
							 
						 
						
							
							
								
								Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'  
							
							... 
							
							
							
							Follow and unfollow using screen_name
See merge request !9  
							
						 
						
							2017-04-23 10:26:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a2b79ce7d1 
								
							 
						 
						
							
							
								
								Add outgoin federation to twitter api.  
							
							... 
							
							
							
							Doesn't really belong there, find a different place for it. Should
federate on every activity insertion. 
							
						 
						
							2017-04-22 12:08:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								28b203d08f 
								
							 
						 
						
							
							
								
								Add Undo of Follow Activity insertion  
							
							
							
						 
						
							2017-04-21 19:54:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								a9b3f99d48 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-21 18:36:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9afc672009 
								
							 
						 
						
							
							
								
								Quick fix for activities without 'to'.  
							
							
							
						 
						
							2017-04-21 01:01:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								3a56d7318f 
								
							 
						 
						
							
							
								
								Add statuses/mentions endpoint  
							
							
							
						 
						
							2017-04-20 15:18:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								b248fc7dfb 
								
							 
						 
						
							
							
								
								Refactor unfollow/2  
							
							
							
						 
						
							2017-04-20 10:57:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								01901d9835 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-20 10:46:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								d952b6cd7b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-20 10:39:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambadalambda 
								
							 
						 
						
							
							
							
							
								
							
							
								eda742c78b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/user-timeline' into 'develop'  
							
							... 
							
							
							
							Feature/user timeline
See merge request !8  
							
						 
						
							2017-04-19 05:50:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								ef5033d7a7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow  
							
							
							
						 
						
							2017-04-16 17:18:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								82914e1e4d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name  
							
							
							
						 
						
							2017-04-16 17:12:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								63f04b314d 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2017-04-16 17:05:48 +03:00