rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								74346a7035
								
							
						 | 
						
							
							
								
								Fix merge conflict
							
							
							
							
							
						 | 
						
							2019-01-18 18:31:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								997f4a5e09
								
							
						 | 
						
							
							
								
								Remove custom emojis and trailing whitespaces from previews
							
							
							
							
							
						 | 
						
							2019-01-18 10:28:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b1af4798a
								
							
						 | 
						
							
							
								
								Use object instead of activity for metadata
							
							
							
							
							
						 | 
						
							2019-01-18 09:32:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								98d9dcd509
								
							
						 | 
						
							
							
								
								Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
							
							
							
							
							
							
							
							[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678 
							
						 | 
						
							2019-01-17 19:27:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae8a5942cf
								
							
						 | 
						
							
							
								
								Merge branch 'bad-copy-paste' into 'develop'
							
							
							
							
							
							
							
							Fix bad link in likes collection
See merge request pleroma/pleroma!679 
							
						 | 
						
							2019-01-17 19:22:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								948fba6f76
								
							
						 | 
						
							
							
								
								Fix bad link in likes collection
							
							
							
							
							
							
							
							Don't copy and paste, mkay 
							
						 | 
						
							2019-01-17 18:21:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a95d5da607
								
							
						 | 
						
							
							
								
								Don't show content if empty or zero width space
							
							
							
							
							
						 | 
						
							2019-01-17 20:18:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								954dc4a4ad
								
							
						 | 
						
							
							
								
								[#502] Fixed user_count in /api/v1/instance to include only active local users.
							
							
							
							
							
						 | 
						
							2019-01-17 19:16:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								849c83ed46
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2019-01-17 16:10:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bc9a641ba
								
							
						 | 
						
							
							
								
								Default to disabled in the code in case the setting is absent from config.exs
							
							
							
							
							
						 | 
						
							2019-01-17 16:01:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								388ceb6a7d
								
							
						 | 
						
							
							
								
								Fix the issue with get_by_nickname never being called
							
							
							
							
							
						 | 
						
							2019-01-17 19:00:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c368d42a2
								
							
						 | 
						
							
							
								
								Make attachment links configurable
							
							
							
							
							
							
							
							Thanks @href! 
							
						 | 
						
							2019-01-17 15:48:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d5f15cd42
								
							
						 | 
						
							
							
								
								Introduce optional unfurling of nsfw content
							
							
							
							
							
						 | 
						
							2019-01-17 11:00:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0256bd2f1d
								
							
						 | 
						
							
							
								
								Use object url instead of a hack
							
							
							
							
							
						 | 
						
							2019-01-17 10:34:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd3a558230
								
							
						 | 
						
							
							
								
								Apply feld's patch
							
							
							
							
							
						 | 
						
							2019-01-17 09:18:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fa508cc2b
								
							
						 | 
						
							
							
								
								Remove @providers and call Pleroma.config on runtime
							
							
							
							
							
						 | 
						
							2019-01-16 18:04:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb43f4cee9
								
							
						 | 
						
							
							
								
								Remove useless with in opengraph.ex
							
							
							
							
							
						 | 
						
							2019-01-16 18:02:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a90b5d91a
								
							
						 | 
						
							
							
								
								oof
							
							
							
							
							
						 | 
						
							2019-01-16 18:01:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a9f089812
								
							
						 | 
						
							
							
								
								remove id cast
							
							
							
							
							
						 | 
						
							2019-01-16 17:58:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a08dee379
								
							
						 | 
						
							
							
								
								cache ap_id in id instead of caching user two times
							
							
							
							
							
						 | 
						
							2019-01-16 17:44:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								82cf9b9751
								
							
						 | 
						
							
							
								
								forgot to remove this thing
							
							
							
							
							
						 | 
						
							2019-01-16 17:16:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								293f6a8b71
								
							
						 | 
						
							
							
								
								join us now and share the software~. Also tests
							
							
							
							
							
						 | 
						
							2019-01-16 17:15:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								943324b661
								
							
						 | 
						
							
							
								
								MastoAPI: Don't break on missing users.
							
							
							
							
							
						 | 
						
							2019-01-16 15:13:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b44995866b
								
							
						 | 
						
							
							
								
								Replace map with reduce to remove nils
							
							
							
							
							
						 | 
						
							2019-01-16 16:52:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								608cc65d43
								
							
						 | 
						
							
							
								
								Merge branch 'feature/improve-microformats' into 'develop'
							
							
							
							
							
							
							
							improve microformats support
See merge request pleroma/pleroma!672 
							
						 | 
						
							2019-01-16 09:06:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								da4b670451
								
							
						 | 
						
							
							
								
								Merge branch '518_instance_stats_fix' into 'develop'
							
							
							
							
							
							
							
							[#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
							
						 | 
						
							2019-01-16 08:59:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff01fd3c4f
								
							
						 | 
						
							
							
								
								Remove caching because it does not affect performance and may be even worse in some cases
							
							
							
							
							
						 | 
						
							2019-01-16 11:18:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								90433b988e
								
							
						 | 
						
							
							
								
								[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
							
							
							
							
							
						 | 
						
							2019-01-16 11:07:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfe2a11a6b
								
							
						 | 
						
							
							
								
								Add config doc
							
							
							
							
							
						 | 
						
							2019-01-16 10:45:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9c27e137d
								
							
						 | 
						
							
							
								
								Add a fallback function to handle generic params, just in case
							
							
							
							
							
						 | 
						
							2019-01-16 10:38:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a76793006b
								
							
						 | 
						
							
							
								
								Thanks you rinpatch, very cool
							
							
							
							
							
						 | 
						
							2019-01-16 10:35:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0039d45b5b
								
							
						 | 
						
							
							
								
								No need to use activity in the key
							
							
							
							
							
						 | 
						
							2019-01-16 10:30:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								70b2bb6ede
								
							
						 | 
						
							
							
								
								add caching
							
							
							
							
							
						 | 
						
							2019-01-16 10:26:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd1432d695
								
							
						 | 
						
							
							
								
								Disable previews for any activity, but create
							
							
							
							
							
						 | 
						
							2019-01-16 09:42:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								461ab9489d
								
							
						 | 
						
							
							
								
								formatter: improve microformats markup
							
							
							
							
							
						 | 
						
							2019-01-16 03:54:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ddab78247
								
							
						 | 
						
							
							
								
								html: allow microformats-related markup through the html filter
							
							
							
							
							
						 | 
						
							2019-01-16 03:54:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								565caff3f4
								
							
						 | 
						
							
							
								
								cache HTML in OGP
							
							
							
							
							
						 | 
						
							2019-01-16 00:07:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9aa69e12b8
								
							
						 | 
						
							
							
								
								Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
							
							
							
							
							
						 | 
						
							2019-01-15 23:25:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a444c0d22
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/websub-hardening' into 'develop'
							
							
							
							
							
							
							
							websub: improve error handling
See merge request pleroma/pleroma!670 
							
						 | 
						
							2019-01-15 20:02:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e630bea0d
								
							
						 | 
						
							
							
								
								Add twitter card, filter nsfw
							
							
							
							
							
						 | 
						
							2019-01-15 23:00:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d3241753f
								
							
						 | 
						
							
							
								
								http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
							
							
							
							
							
						 | 
						
							2019-01-15 19:31:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								70f140681f
								
							
						 | 
						
							
							
								
								Add space between name and nickname
							
							
							
							
							
						 | 
						
							2019-01-15 21:47:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8eecd61b4
								
							
						 | 
						
							
							
								
								Formating
							
							
							
							
							
						 | 
						
							2019-01-15 21:20:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								410fd9d774
								
							
						 | 
						
							
							
								
								Attach attachments
							
							
							
							
							
						 | 
						
							2019-01-15 21:17:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								17da432dbb
								
							
						 | 
						
							
							
								
								websub: improve error handling
							
							
							
							
							
						 | 
						
							2019-01-15 18:03:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff6c9a5c96
								
							
						 | 
						
							
							
								
								Introduce get_by_id in Activity, replace newlines with spaces
							
							
							
							
							
						 | 
						
							2019-01-15 20:00:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								850912b06b
								
							
						 | 
						
							
							
								
								refactor opengraph to a different module with a behaviour
							
							
							
							
							
						 | 
						
							2019-01-15 19:43:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8745c8c990
								
							
						 | 
						
							
							
								
								remove useless newlines after every tag. Make domain.com/username provide opengraph too
							
							
							
							
							
						 | 
						
							2019-01-15 18:34:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2858fd2da2
								
							
						 | 
						
							
							
								
								add a fallback function
							
							
							
							
							
						 | 
						
							2019-01-15 12:11:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f23139864
								
							
						 | 
						
							
							
								
								please don't bully me for this
							
							
							
							
							
						 | 
						
							2019-01-15 12:02:55 +03:00 | 
						
						
							
							
							
								
							
							
						 |