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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f75f707f6c
								
							
						 | 
						
							
							
								
								Revert Activity tombstones, add ObjectTombstone struct
							
							
							
							
							
						 | 
						
							2018-12-25 03:00:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2bbec33c71
								
							
						 | 
						
							
							
								
								Fix failing tests
							
							
							
							
							
						 | 
						
							2018-12-25 00:29:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								18a4cbb244
								
							
						 | 
						
							
							
								
								Capitalize "tombstone"
							
							
							
							
							
						 | 
						
							2018-12-24 20:09:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f412cf6e6
								
							
						 | 
						
							
							
								
								Create tombstone instead of object deletion
							
							
							
							
							
						 | 
						
							2018-12-24 02:25:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								005b4194ff
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
							
							
							
							
							
							
							
							Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459 
							
						 | 
						
							2018-12-23 14:46:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								34a4ed22c4
								
							
						 | 
						
							
							
								
								twitter api: add "Video" to supported activity types list
							
							
							
							
							
						 | 
						
							2018-12-23 14:00:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								79b51a97fe
								
							
						 | 
						
							
							
								
								twitter api: activity representer: remove peertube hack
							
							
							
							
							
						 | 
						
							2018-12-23 14:00:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								32dfc1d12a
								
							
						 | 
						
							
							
								
								mastodon api: status view: remove obsolete peertube hack
							
							
							
							
							
						 | 
						
							2018-12-23 13:40:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								71f6d9f418
								
							
						 | 
						
							
							
								
								transmogrifier: significantly rework handling of peertube videos, add test
							
							
							
							
							
						 | 
						
							2018-12-23 13:31:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3e33fa177
								
							
						 | 
						
							
							
								
								Merge branch 'hotfix/activity-without-content' into 'develop'
							
							
							
							
							
							
							
							Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572 
							
						 | 
						
							2018-12-23 13:17:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aff8067e4
								
							
						 | 
						
							
							
								
								transmogrifier: When it’s a Video move "url" to "attachment"
							
							
							
							
							
						 | 
						
							2018-12-23 13:00:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f07bb6e5
								
							
						 | 
						
							
							
								
								Implement kaniini's tweaks
							
							
							
							
							
						 | 
						
							2018-12-23 12:24:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								c76179419d
								
							
						 | 
						
							
							
								
								Renamed the things
							
							
							
							
							
						 | 
						
							2018-12-23 11:14:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								409ff60bf8
								
							
						 | 
						
							
							
								
								Fix formatting
							
							
							
							
							
						 | 
						
							2018-12-22 23:32:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								92362e1e22
								
							
						 | 
						
							
							
								
								Implement large thread filter
							
							
							
							
							
						 | 
						
							2018-12-22 23:18:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e2030ada8
								
							
						 | 
						
							
							
								
								Merge branch '114_email_confirmation' into 'develop'
							
							
							
							
							
							
							
							[#114] Email confirmation
See merge request pleroma/pleroma!546 
							
						 | 
						
							2018-12-20 13:28:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7cab7de9ff
								
							
						 | 
						
							
							
								
								[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
							
							
							
							
							
							
							
							Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests. 
							
						 | 
						
							2018-12-20 14:48:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f69cbf4755
								
							
						 | 
						
							
							
								
								[#114] Added :user_id component to email confirmation path to improve the security.
							
							
							
							
							
							
							
							Added tests for `confirm_email` action. 
							
						 | 
						
							2018-12-20 13:41:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8adcd1e80f
								
							
						 | 
						
							
							
								
								[#114] Removed flash messages rendering on redirects.
							
							
							
							
							
						 | 
						
							2018-12-20 13:05:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								501ce34d7f
								
							
						 | 
						
							
							
								
								[#114] Stylistic adjustments.
							
							
							
							
							
						 | 
						
							2018-12-20 12:55:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1b93b5be7
								
							
						 | 
						
							
							
								
								[#413] fix parse mentions
							
							
							
							
							
						 | 
						
							2018-12-20 09:35:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								fda148a9a2
								
							
						 | 
						
							
							
								
								Merge branch 'documentation/copy-pleroma-api' into 'develop'
							
							
							
							
							
							
							
							Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571 
							
						 | 
						
							2018-12-20 04:01:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b520d44b58
								
							
						 | 
						
							
							
								
								[#114] mix format
							
							
							
							
							
						 | 
						
							2018-12-19 19:03:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								279096228c
								
							
						 | 
						
							
							
								
								[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
							
							
							
							
							
							
							
							unless requested by admin or moderator. 
							
						 | 
						
							2018-12-19 18:56:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a532ad5d72
								
							
						 | 
						
							
							
								
								[#114] User.register/1 tweak.
							
							
							
							
							
						 | 
						
							2018-12-19 17:24:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								968d7490b6
								
							
						 | 
						
							
							
								
								[#114] User.Info: renamed confirmation_update to confirmation_changeset.
							
							
							
							
							
						 | 
						
							2018-12-19 16:31:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								59fc5d15df
								
							
						 | 
						
							
							
								
								[#114] User.Info: renamed confirmation_update to confirmation_change.
							
							
							
							
							
						 | 
						
							2018-12-19 16:27:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								f98ee9402f
								
							
						 | 
						
							
							
								
								Merge branch 'userless-admin' into 'develop'
							
							
							
							
							
							
							
							Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576 
							
						 | 
						
							2018-12-19 00:12:39 +00:00 | 
						
						
							
							
							
								
							
							
						 |