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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								67b4297f4d
								
							
						 | 
						
							
							
								
								[#483] Refactored blocks and follows import, added tests.
							
							
							
							
							
						 | 
						
							2018-12-29 12:02:37 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4562105e7
								
							
						 | 
						
							
							
								
								Implement exclude_reblogs and include_rts
							
							
							
							
							
						 | 
						
							2018-12-26 21:38:00 -08: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								012b7ab5e6
								
							
						 | 
						
							
							
								
								Add test to check /object/:id does not leak the tombstone itself
							
							
							
							
							
						 | 
						
							2018-12-25 23:40:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aeb89bece6
								
							
						 | 
						
							
							
								
								Remove unused test
							
							
							
							
							
						 | 
						
							2018-12-25 03:38:02 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c08d229db
								
							
						 | 
						
							
							
								
								tests: add legal boilerplate
							
							
							
							
							
						 | 
						
							2018-12-23 20:57:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2bceaf688
								
							
						 | 
						
							
							
								
								tests: twitter api: add test proving that peertube videos are correctly handled
							
							
							
							
							
						 | 
						
							2018-12-23 14:00:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								873938d223
								
							
						 | 
						
							
							
								
								tests: twitter api: activity view test: enable tesla mock
							
							
							
							
							
						 | 
						
							2018-12-23 14:00:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f48485f64
								
							
						 | 
						
							
							
								
								tests: mastodon api: add test verifying that peertube videos are correctly rendered
							
							
							
							
							
						 | 
						
							2018-12-23 13:44:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								71f6d9f418
								
							
						 | 
						
							
							
								
								transmogrifier: significantly rework handling of peertube videos, add test
							
							
							
							
							
						 | 
						
							2018-12-23 13:31:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								851db74f1c
								
							
						 | 
						
							
							
								
								[#114] Fixed test.
							
							
							
							
							
						 | 
						
							2018-12-20 15:23:16 +03: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b096e30cff
								
							
						 | 
						
							
							
								
								[#114] Added email confirmation resend action. Added tests
							
							
							
							
							
							
							
							for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users. 
							
						 | 
						
							2018-12-18 17:22:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aed0f90287
								
							
						 | 
						
							
							
								
								[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.
							
							
							
							
							
						 | 
						
							2018-12-18 17:22:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								92a5133c42
								
							
						 | 
						
							
							
								
								fix text field
							
							
							
							
							
						 | 
						
							2018-12-17 22:53:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								078b8b6d22
								
							
						 | 
						
							
							
								
								Merge branch 'phoenix14' into 'develop'
							
							
							
							
							
							
							
							Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560 
							
						 | 
						
							2018-12-17 19:30:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b12a904911
								
							
						 | 
						
							
							
								
								Integration tests for mastodon websocket
							
							
							
							
							
						 | 
						
							2018-12-17 17:09:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								567359790e
								
							
						 | 
						
							
							
								
								Merge branch 'testfix/webfinger-jrd' into 'develop'
							
							
							
							
							
							
							
							WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554 
							
						 | 
						
							2018-12-17 09:19:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f672555ad3
								
							
						 | 
						
							
							
								
								Upgrade to Phoenix 1.4
							
							
							
							
							
						 | 
						
							2018-12-16 17:15:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								28478a9c4f
								
							
						 | 
						
							
							
								
								Merge branch 'fix/masto-put-settings' into 'develop'
							
							
							
							
							
							
							
							Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557 
							
						 | 
						
							2018-12-16 11:21:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c783e35c0
								
							
						 | 
						
							
							
								
								Mastodon API: Fix PUT /api/web/settings
							
							
							
							
							
						 | 
						
							2018-12-16 13:15:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cddab5700b
								
							
						 | 
						
							
							
								
								WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
							
							
							
							
							
						 | 
						
							2018-12-15 17:56:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5af91020f8
								
							
						 | 
						
							
							
								
								Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
							
							
							
							
							
						 | 
						
							2018-12-15 16:17:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfe27c1b55
								
							
						 | 
						
							
							
								
								Merge branch '114_email_invites' into 'develop'
							
							
							
							
							
							
							
							[#114] Email invites
See merge request pleroma/pleroma!541 
							
						 | 
						
							2018-12-14 20:22:24 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								07e93f9940
								
							
						 | 
						
							
							
								
								[#114] Improved tests.
							
							
							
							
							
						 | 
						
							2018-12-14 13:52:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a89e3b4b60
								
							
						 | 
						
							
							
								
								[#114] Moved email_invite action to AdminAPIController, adjusted tests.
							
							
							
							
							
						 | 
						
							2018-12-14 12:28:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cbf16a5fe
								
							
						 | 
						
							
							
								
								[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
							
							
							
							
							
						 | 
						
							2018-12-14 12:28:22 +03:00 | 
						
						
							
							
							
								
							
							
						 |