Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
							
							
							
							
							
						 | 
						
							2021-05-31 16:49:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0
							
							
							
							
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 | 
						
							2021-05-31 16:48:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ad7d4ff8bc
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
							
							
							
							
							
						 | 
						
							2021-05-19 12:49:00 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2
								
							
						 | 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing
							
							
							
							
							
						 | 
						
							2021-05-18 17:45:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5992382cf8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 | 
						
							2021-02-11 19:31:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed8ef80b5e
								
							
						 | 
						
							
							
								
								RSS: Make sure post URL is the first <link> element
							
							
							
							
							
							
							
							Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.
Related to #2425. 
							
						 | 
						
							2021-02-08 22:44:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3966add048
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2824 
							
						 | 
						
							2020-12-28 12:02:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176
								
							
						 | 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead
							
							
							
							
							
						 | 
						
							2020-12-28 11:05:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430
								
							
						 | 
						
							
							
								
								Create Object.hashtags/1 wrapper
							
							
							
							
							
						 | 
						
							2020-12-22 05:15:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b
								
							
						 | 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]
							
							
							
							
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 | 
						
							2020-12-22 05:15:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee221277b0
								
							
						 | 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.
							
							
							
							
							
						 | 
						
							2020-12-21 22:54:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0c68b9ac13
								
							
						 | 
						
							
							
								
								escaping summary and other fields in xml templates
							
							
							
							
							
						 | 
						
							2020-11-10 10:46:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4d330d9df1
								
							
						 | 
						
							
							
								
								fix for use of published from different entities
							
							
							
							
							
						 | 
						
							2020-04-16 18:05:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								91870c8995
								
							
						 | 
						
							
							
								
								adding rss for user feed
							
							
							
							
							
						 | 
						
							2020-03-16 12:45:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								99c0a11c58
								
							
						 | 
						
							
							
								
								added atom feed
							
							
							
							
							
						 | 
						
							2020-01-24 22:12:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b53573a837
								
							
						 | 
						
							
							
								
								add tag feeds
							
							
							
							
							
						 | 
						
							2019-12-18 09:19:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								22fc271e23
								
							
						 | 
						
							
							
								
								init tag feed
							
							
							
							
							
						 | 
						
							2019-12-06 09:33:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d0b989521
								
							
						 | 
						
							
							
								
								add subject to atom feed
							
							
							
							
							
						 | 
						
							2019-11-10 11:10:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								c00ae10af8
								
							
						 | 
						
							
							
								
								feed: don't advertise salmon endpoint
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f82e42e4e
								
							
						 | 
						
							
							
								
								websub: remove entirely
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3f77a99f
								
							
						 | 
						
							
							
								
								Extract RSS Feed functionality from OStatus
							
							
							
							
							
						 | 
						
							2019-10-07 12:20:41 +00:00 | 
						
						
							
							
							
								
							
							
						 |