lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1ae495878
								
							
						 | 
						
							
							
								
								Add user muted status info to MastodonAPI.
							
							
							
							
							
						 | 
						
							2019-02-27 16:46:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								59c27f29c8
								
							
						 | 
						
							
							
								
								Add some nicer urls in status view.
							
							
							
							
							
						 | 
						
							2019-02-20 17:36:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								96c725328b
								
							
						 | 
						
							
							
								
								Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
							
							
							
							
							
						 | 
						
							2019-02-16 20:38:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac72b578da
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting
							
							
							
							
							
						 | 
						
							2019-02-11 12:10:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								c01ef574c1
								
							
						 | 
						
							
							
								
								Refactor as per Rin's suggestions, add endpoint tests
							
							
							
							
							
						 | 
						
							2019-02-11 12:04:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc21fc5f53
								
							
						 | 
						
							
							
								
								refactor, status view updating, error handling
							
							
							
							
							
						 | 
						
							2019-02-10 10:42:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8bcfac93a8
								
							
						 | 
						
							
							
								
								Make credo happy
							
							
							
							
							
						 | 
						
							2019-02-09 14:59:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								65a4b9fbea
								
							
						 | 
						
							
							
								
								mastodon api: rich media: don't clobber %URI struct with a string
							
							
							
							
							
						 | 
						
							2019-02-06 18:02:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d94b67e40
								
							
						 | 
						
							
							
								
								mastodon api: fix rendering of cards without image URLs (closes #597)
							
							
							
							
							
						 | 
						
							2019-02-05 18:30:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								68d461b3a9
								
							
						 | 
						
							
							
								
								Check if rich media uri is relative
							
							
							
							
							
						 | 
						
							2019-02-02 12:24:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								833404f0f5
								
							
						 | 
						
							
							
								
								Use with instead of if in the card
							
							
							
							
							
						 | 
						
							2019-02-02 12:04:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4d18f328b
								
							
						 | 
						
							
							
								
								merge only if page_url is an absolute path
							
							
							
							
							
						 | 
						
							2019-02-02 11:53:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								cbadf9d333
								
							
						 | 
						
							
							
								
								Fix rich media relative path
							
							
							
							
							
						 | 
						
							2019-02-02 11:38:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								00d4333373
								
							
						 | 
						
							
							
								
								Merge branch 'features/glitch-soc-frontend' into 'develop'
							
							
							
							
							
							
							
							Features/glitch soc frontend
See merge request pleroma/pleroma!192 
							
						 | 
						
							2019-01-31 10:16:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebb3496386
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
							
							
							
							
							
							
							
							Rich Media support, part 2.
See merge request pleroma/pleroma!719 
							
						 | 
						
							2019-01-29 05:11:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								df2f7b39dd
								
							
						 | 
						
							
							
								
								re f83bae7c: remove unnecessary filter
							
							
							
							
							
						 | 
						
							2019-01-28 12:24:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddc7ae2c1a
								
							
						 | 
						
							
							
								
								mastodon api: card: force OGP images through mediaproxy
							
							
							
							
							
						 | 
						
							2019-01-28 06:42:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e42251e06
								
							
						 | 
						
							
							
								
								rich media: add helpers module, use instead of MastodonAPI module
							
							
							
							
							
						 | 
						
							2019-01-28 06:04:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a37ddc2dc
								
							
						 | 
						
							
							
								
								mastodon api: embed card in status object
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								132d815f1f
								
							
						 | 
						
							
							
								
								mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
							
							
							
							
							
						 | 
						
							2019-01-28 05:53:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cda1470e02
								
							
						 | 
						
							
							
								
								[MastoAPI][GlitchAPI] Add bookmarks
							
							
							
							
							
						 | 
						
							2019-01-28 04:47:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f83bae7c22
								
							
						 | 
						
							
							
								
								Views: wrap activity rendering in a rescue
							
							
							
							
							
							
							
							this avoids complete timeline breakage when an activity fucks up
rendering. 
							
						 | 
						
							2019-01-27 19:16:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2de208817c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency
							
							
							
							
							
						 | 
						
							2019-01-23 13:05:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f
								
							
						 | 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2fdbd4d137
								
							
						 | 
						
							
							
								
								Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								75dfa1f0b0
								
							
						 | 
						
							
							
								
								mastodon api: get_visibility(): DMs never have a cc list.
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								943324b661
								
							
						 | 
						
							
							
								
								MastoAPI: Don't break on missing users.
							
							
							
							
							
						 | 
						
							2019-01-16 15:13:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e679da4c34
								
							
						 | 
						
							
							
								
								add pinned property to StatusView
							
							
							
							
							
						 | 
						
							2019-01-08 15:27:02 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								846082e54f
								
							
						 | 
						
							
							
								
								Different caches based on the module. Remove scrubber version since it is not relevant anymore
							
							
							
							
							
						 | 
						
							2019-01-05 00:19:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e09c2bd7d
								
							
						 | 
						
							
							
								
								Move scrubber cache-related functions to Pleroma.HTML
							
							
							
							
							
						 | 
						
							2018-12-31 08:19:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								535fddd286
								
							
						 | 
						
							
							
								
								Friendship ended with Postgresql now Cachex is my best friend
							
							
							
							
							
						 | 
						
							2018-12-30 19:33:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								d9f40b05b3
								
							
						 | 
						
							
							
								
								Added get_stripped_html_for_object. Renamed a few things
							
							
							
							
							
						 | 
						
							2018-12-30 16:51:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								19f9889fbe
								
							
						 | 
						
							
							
								
								I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
							
							
							
							
							
						 | 
						
							2018-12-29 17:45:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								32dfc1d12a
								
							
						 | 
						
							
							
								
								mastodon api: status view: remove obsolete peertube hack
							
							
							
							
							
						 | 
						
							2018-12-23 13:40:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea72ac549b
								
							
						 | 
						
							
							
								
								fix case when tags is invalid
							
							
							
							
							
						 | 
						
							2018-12-14 23:16:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3ec09bb38
								
							
						 | 
						
							
							
								
								fix tags
							
							
							
							
							
						 | 
						
							2018-12-14 22:09:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								068353ac0b
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2018-12-09 11:24:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9442588ae9
								
							
						 | 
						
							
							
								
								fix hashtags in api response
							
							
							
							
							
						 | 
						
							2018-12-09 11:24:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3e50bb667f
								
							
						 | 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
							
							
							
							
							
						 | 
						
							2018-11-03 14:42:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d8f076125
								
							
						 | 
						
							
							
								
								mastodon api: add support for rendering Page objects
							
							
							
							
							
						 | 
						
							2018-11-01 10:00:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								755f166406
								
							
						 | 
						
							
							
								
								Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
							
							
							
							
							
						 | 
						
							2018-11-01 09:55:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b0a940d5a2
								
							
						 | 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
							
							
							
							
							
						 | 
						
							2018-10-25 05:24:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0c10be8731
								
							
						 | 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
							
							
							
							
							
						 | 
						
							2018-10-25 05:24:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3b0e9287a5
								
							
						 | 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
							
							
							
							
							
						 | 
						
							2018-10-25 05:24:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								958e085acb
								
							
						 | 
						
							
							
								
								mastodon api: add support for user-supplied html policy
							
							
							
							
							
						 | 
						
							2018-09-22 02:53:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								43d0b7bf7a
								
							
						 | 
						
							
							
								
								[Pleroma.Web.MastodonAPI.StatusView] add replies_count
							
							
							
							
							
						 | 
						
							2018-09-20 16:10:46 +02:00 | 
						
						
							
							
							
								
							
							
						 |