dtluna
								
							 
						 | 
						
							
							
							
							
								
							
							
								08e53df91e
								
							
						 | 
						
							
							
								
								Move util functions to UtilController
							
							
							
							
							
						 | 
						
							2017-06-20 17:55:57 +03: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								45c751985e
								
							
						 | 
						
							
							
								
								Move finmojis to representation.
							
							
							
							
							
						 | 
						
							2017-06-19 18:06:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								66b4fee80e
								
							
						 | 
						
							
							
								
								Add finmoji.
							
							
							
							
							
						 | 
						
							2017-06-19 17:51:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa82822932
								
							
						 | 
						
							
							
								
								Revert "Add invisible tags to TwAPI output."
							
							
							
							
							
							
							
							This reverts commit a92a9dce94. 
							
						 | 
						
							2017-06-18 18:59:13 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								fafb765c48
								
							
						 | 
						
							
							
								
								Output tags list in TwAPI.
							
							
							
							
							
						 | 
						
							2017-06-18 14:43:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								8feec8d390
								
							
						 | 
						
							
							
								
								Strip unsafe html on output in TwAPI.
							
							
							
							
							
						 | 
						
							2017-06-18 13:40:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b41e103e1
								
							
						 | 
						
							
							
								
								Remove html from user bios on display.
							
							
							
							
							
							
							
							This is mainly to fix problems of bios coming from mastodong. 
							
						 | 
						
							2017-06-18 13:17:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								83c657afa5
								
							
						 | 
						
							
							
								
								Do some basic escaping.
							
							
							
							
							
						 | 
						
							2017-06-14 14:46:18 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								00c032783d
								
							
						 | 
						
							
							
								
								Fix NaN statuses per day.
							
							
							
							
							
						 | 
						
							2017-06-05 15:47:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7fdd1b7ff
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
							
							
							
							
							
						 | 
						
							2017-06-01 11:24:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6aa60c829
								
							
						 | 
						
							
							
								
								Shorten names in links.
							
							
							
							
							
						 | 
						
							2017-05-30 14:26:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								4854a604ef
								
							
						 | 
						
							
							
								
								Extract note handler.
							
							
							
							
							
						 | 
						
							2017-05-20 13:41:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								48f9df2391
								
							
						 | 
						
							
							
								
								Keep newlines around.
							
							
							
							
							
						 | 
						
							2017-05-18 16:41:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a92a9dce94
								
							
						 | 
						
							
							
								
								Add invisible tags to TwAPI output.
							
							
							
							
							
						 | 
						
							2017-05-18 16:24:41 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								71362acb93
								
							
						 | 
						
							
							
								
								Quick fix for database filling.
							
							
							
							
							
						 | 
						
							2017-05-09 00:20:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								1418d72749
								
							
						 | 
						
							
							
								
								Add class=attachment to attachment links.
							
							
							
							
							
						 | 
						
							2017-05-08 20:12:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9da7d3219
								
							
						 | 
						
							
							
								
								typo.
							
							
							
							
							
						 | 
						
							2017-05-07 20:30:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								7303786160
								
							
						 | 
						
							
							
								
								Add some twapi fixes.
							
							
							
							
							
						 | 
						
							2017-05-07 20:20:53 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								95ab0dc3c5
								
							
						 | 
						
							
							
								
								Add conversation ids to twapi announce representer.
							
							
							
							
							
						 | 
						
							2017-05-07 12:46:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								7269c51f3a
								
							
						 | 
						
							
							
								
								Some refactoring.
							
							
							
							
							
						 | 
						
							2017-05-05 12:07:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c48c381e90
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into dtluna/pleroma-refactor/1
							
							
							
							
							
						 | 
						
							2017-05-05 11:46:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								33c803d6da
								
							
						 | 
						
							
							
								
								Add attachment link to posts.
							
							
							
							
							
						 | 
						
							2017-05-02 18:25:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								16f8406eb6
								
							
						 | 
						
							
							
								
								Add statusnet_profile_url to the TwAPI.
							
							
							
							
							
						 | 
						
							2017-05-02 14:36:04 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffc604a2c2
								
							
						 | 
						
							
							
								
								Use cache for user info data.
							
							
							
							
							
							
							
							Later these should be persisted in the user. 
							
						 | 
						
							2017-04-30 10:04:54 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dtluna
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cf7c13228
								
							
						 | 
						
							
							
								
								Refactor code to comply with credo suggestions
							
							
							
							
							
						 | 
						
							2017-04-27 16:18:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8882ab3da
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/incoming_ostatus
							
							
							
							
							
						 | 
						
							2017-04-26 09:18:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dtluna
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3655d1c47
								
							
						 | 
						
							
							
								
								Remove unnecessary status_update definition
							
							
							
							
							
						 | 
						
							2017-04-25 19:47:16 +03: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 | 
						
						
							
							
							
								
							
							
						 |