lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								400337b0a7
								
							
						 | 
						
							
							
								
								Make Federator options configurable.
							
							
							
							
							
						 | 
						
							2019-01-01 14:46:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								90e157ef80
								
							
						 | 
						
							
							
								
								Merge branch 'features/admin-api-user-views' into 'develop'
							
							
							
							
							
							
							
							User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589 
							
						 | 
						
							2018-12-31 15:49:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								33e3a7ba7d
								
							
						 | 
						
							
							
								
								Merge branch 'fix/scrubber-cache' into 'develop'
							
							
							
							
							
							
							
							[#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610 
							
						 | 
						
							2018-12-31 09:56:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ed9b31a5f
								
							
						 | 
						
							
							
								
								Eh?
							
							
							
							
							
						 | 
						
							2018-12-31 08:25:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e09c2bd7d
								
							
						 | 
						
							
							
								
								Move scrubber cache-related functions to Pleroma.HTML
							
							
							
							
							
						 | 
						
							2018-12-31 08:19:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e7da98b18
								
							
						 | 
						
							
							
								
								Merge branch 'mr/retry-queue' into 'develop'
							
							
							
							
							
							
							
							Improves RetryQueue behavior
See merge request pleroma/pleroma!609 
							
						 | 
						
							2018-12-30 21:47:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								dec23500d8
								
							
						 | 
						
							
							
								
								Resolve merge conflict
							
							
							
							
							
						 | 
						
							2018-12-30 21:00:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab3089d6a7
								
							
						 | 
						
							
							
								
								Fix comment in object.ex
							
							
							
							
							
						 | 
						
							2018-12-30 20:51:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								c50353e6ae
								
							
						 | 
						
							
							
								
								shame on me for not testing after revert
							
							
							
							
							
						 | 
						
							2018-12-30 20:44:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f9da55adc
								
							
						 | 
						
							
							
								
								Fix formating. Aparently my pre-commit hook broke.
							
							
							
							
							
						 | 
						
							2018-12-30 20:16:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								62af23bd26
								
							
						 | 
						
							
							
								
								Revert some changes in html.ex
							
							
							
							
							
						 | 
						
							2018-12-30 20:12:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								c119ea3a57
								
							
						 | 
						
							
							
								
								Friendship ended with Postgresql now Cachex is my best friend
							
							
							
							
							
						 | 
						
							2018-12-30 20:00:01 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Loftis
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb286fdeba
								
							
						 | 
						
							
							
								
								Improves RetryQueue behavior
							
							
							
							
							
							
							
							reduces to one single timer firing once a second
switches to a parallel worker model 
							
						 | 
						
							2018-12-30 15:16:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								bce152aba0
								
							
						 | 
						
							
							
								
								Tidy up the code. Rename key to signature
							
							
							
							
							
						 | 
						
							2018-12-30 15:58:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								66d1c31461
								
							
						 | 
						
							
							
								
								Fix some stupid typos
							
							
							
							
							
						 | 
						
							2018-12-30 13:51:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								f40562b4e1
								
							
						 | 
						
							
							
								
								Respond with full activity to outbox post
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e781715c8
								
							
						 | 
						
							
							
								
								Limit activity types accepted to outbox to only 'Create'
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								569bad8210
								
							
						 | 
						
							
							
								
								Create activity when client posts to outbox
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								26dc2dddab
								
							
						 | 
						
							
							
								
								Implement ActivityPub inbox view
							
							
							
							
							
							
							
							More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported 
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								a32e23905a
								
							
						 | 
						
							
							
								
								Use Object.change instead of Ecto.Changeset.change
							
							
							
							
							
						 | 
						
							2018-12-30 11:08:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa082ca7b6
								
							
						 | 
						
							
							
								
								Wire up stub routes for client calls of activitypub inbox/outbox
							
							
							
							
							
							
							
							Code style: remove wrapping function of outbox 
							
						 | 
						
							2018-12-29 22:22:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rin Toshaka
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a0163db53
								
							
						 | 
						
							
							
								
								use Kernel.put_in instead of Map.merge
							
							
							
							
							
						 | 
						
							2018-12-29 21:50:34 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dc5f04976
								
							
						 | 
						
							
							
								
								Merge branch 'carrot-bullying' into 'develop'
							
							
							
							
							
							
							
							Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595 
							
						 | 
						
							2018-12-29 11:46:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd8f2196f6
								
							
						 | 
						
							
							
								
								Merge branch '483_blocks_import_export' into 'develop'
							
							
							
							
							
							
							
							[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603 
							
						 | 
						
							2018-12-29 11:34:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								523848d1fd
								
							
						 | 
						
							
							
								
								Salmon# fixed publish an activity to remote accounts
							
							
							
							
							
						 | 
						
							2018-12-29 12:48:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bd49a3222
								
							
						 | 
						
							
							
								
								[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
							
							
							
							
							
						 | 
						
							2018-12-29 12:26:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3574dccbb
								
							
						 | 
						
							
							
								
								[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
							
							
							
							
							
							
							
							(<nick>@<our_instance_host>). 
							
						 | 
						
							2018-12-29 12:15:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								67b4297f4d
								
							
						 | 
						
							
							
								
								[#483] Refactored blocks and follows import, added tests.
							
							
							
							
							
						 | 
						
							2018-12-29 12:02:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								49cf5f9ce0
								
							
						 | 
						
							
							
								
								Merge branch '471_invalid_accounts_rendering' into 'develop'
							
							
							
							
							
							
							
							[#471] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599 
							
						 | 
						
							2018-12-29 03:03:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								700661b761
								
							
						 | 
						
							
							
								
								[#483] Blocked users list import (TwitterAPI).
							
							
							
							
							
						 | 
						
							2018-12-28 23:01:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a41786624
								
							
						 | 
						
							
							
								
								[#467] Refactored valid / invalid user rendering.
							
							
							
							
							
						 | 
						
							2018-12-28 22:47:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								68f483ef4c
								
							
						 | 
						
							
							
								
								Merge branch 'fix/no-attachment-links' into 'develop'
							
							
							
							
							
							
							
							Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597 
							
						 | 
						
							2018-12-28 18:33:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e9a15b181
								
							
						 | 
						
							
							
								
								[#483] Blocked users export for TwitterAPI.
							
							
							
							
							
						 | 
						
							2018-12-28 21:08:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b43d630f30
								
							
						 | 
						
							
							
								
								Web.TwitterAPI.UserView: Add rights.admin
							
							
							
							
							
						 | 
						
							2018-12-28 17:38:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d1788ce44
								
							
						 | 
						
							
							
								
								[#471] Factored out User.visible_for?/2.
							
							
							
							
							
						 | 
						
							2018-12-28 14:35:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8cc96cb1f
								
							
						 | 
						
							
							
								
								Fix Twitter timelines for private instances
							
							
							
							
							
						 | 
						
							2018-12-27 22:43:40 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								bee6acd51d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
							
							
							
							
							
							
							
							Create tombstone instead of object deletion
See merge request pleroma/pleroma!593 
							
						 | 
						
							2018-12-27 19:37:55 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cff0292d4b
								
							
						 | 
						
							
							
								
								Merge branch 'reserve-user-names' into 'develop'
							
							
							
							
							
							
							
							Reserve a few user names
See merge request pleroma/pleroma!594 
							
						 | 
						
							2018-12-27 19:35:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6aeb1d4a5
								
							
						 | 
						
							
							
								
								[#471] Prevented rendering of inactive local accounts.
							
							
							
							
							
						 | 
						
							2018-12-27 15:46:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								be70272ab0
								
							
						 | 
						
							
							
								
								Treat only true and "true" as true
							
							
							
							
							
						 | 
						
							2018-12-27 13:21:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4562105e7
								
							
						 | 
						
							
							
								
								Implement exclude_reblogs and include_rts
							
							
							
							
							
						 | 
						
							2018-12-26 21:38:00 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								838c024231
								
							
						 | 
						
							
							
								
								Treat any present value in "no_attachment_links" as true
							
							
							
							
							
						 | 
						
							2018-12-27 02:39:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								551d80cc01
								
							
						 | 
						
							
							
								
								Expose restricted names in nodeinfo.
							
							
							
							
							
						 | 
						
							2018-12-26 12:46:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5811e65e67
								
							
						 | 
						
							
							
								
								Add some hard limits on inserted activities.
							
							
							
							
							
						 | 
						
							2018-12-26 12:39:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								91724d160a
								
							
						 | 
						
							
							
								
								Reserve a few user names
							
							
							
							
							
							
							
							These are all names that are used for domain.com/:route routes or projected to be. 
							
						 | 
						
							2018-12-25 20:10:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca2e9ce9cc
								
							
						 | 
						
							
							
								
								Revert unneeded changes
							
							
							
							
							
						 | 
						
							2018-12-25 03:44:48 +03:00 | 
						
						
							
							
							
								
							
							
						 |