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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8cc96cb1f
								
							
						 | 
						
							
							
								
								Fix Twitter timelines for private instances
							
							
							
							
							
						 | 
						
							2018-12-27 22:43:40 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4562105e7
								
							
						 | 
						
							
							
								
								Implement exclude_reblogs and include_rts
							
							
							
							
							
						 | 
						
							2018-12-26 21:38:00 -08: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								30dc81667c
								
							
						 | 
						
							
							
								
								Merge branch '114_user_registration_emails' into 'develop'
							
							
							
							
							
							
							
							[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531 
							
						 | 
						
							2018-12-14 09:16:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								61ad2ce422
								
							
						 | 
						
							
							
								
								TwitterAPI: Include favorited post in json
							
							
							
							
							
						 | 
						
							2018-12-14 08:24:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								18b9467d1a
								
							
						 | 
						
							
							
								
								[#114] Removed email_invite implementation (to be addressed separately).
							
							
							
							
							
						 | 
						
							2018-12-13 16:22:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00744c6b03
								
							
						 | 
						
							
							
								
								[#114] Initial implementation of user email invitations.
							
							
							
							
							
						 | 
						
							2018-12-13 14:30:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e7d98922e
								
							
						 | 
						
							
							
								
								[#114] Added tests for "POST /api/account/password_reset".
							
							
							
							
							
						 | 
						
							2018-12-12 17:04:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								89b3729afa
								
							
						 | 
						
							
							
								
								fix warnings
							
							
							
							
							
						 | 
						
							2018-12-12 09:09:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									raeno
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ba4a1c5fe
								
							
						 | 
						
							
							
								
								Fixes #415. Properly handle nil and empty string by User.parse_bio
							
							
							
							
							
						 | 
						
							2018-12-10 01:01:43 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a2162bbcb
								
							
						 | 
						
							
							
								
								[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
							
							
							
							
							
						 | 
						
							2018-12-06 22:26:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								abbf347dc7
								
							
						 | 
						
							
							
								
								[#394] View tests fix.
							
							
							
							
							
						 | 
						
							2018-12-06 20:38:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccf0b46dd6
								
							
						 | 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
							
							
							
							
							
							
							
							[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 
							
						 | 
						
							2018-12-06 07:36:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								48a0315646
								
							
						 | 
						
							
							
								
								Merge branch 'follower-hiding' into 'develop'
							
							
							
							
							
							
							
							Network hiding
Closes #356
See merge request pleroma/pleroma!490 
							
						 | 
						
							2018-12-05 21:41:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								76d6b1c6ab
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into follower-hiding
							
							
							
							
							
						 | 
						
							2018-12-05 21:27:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c8ffe7ed3
								
							
						 | 
						
							
							
								
								resolved activity view test
							
							
							
							
							
						 | 
						
							2018-12-06 01:54:04 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								028904c333
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							2018-12-06 01:46:53 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vald
								
							 
						 | 
						
							
							
							
							
								
							
							
								911a877576
								
							
						 | 
						
							
							
								
								resolved api and controller test failures
							
							
							
							
							
						 | 
						
							2018-12-06 01:46:30 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdac215091
								
							
						 | 
						
							
							
								
								TwitterAPI: Show users their own network.
							
							
							
							
							
						 | 
						
							2018-12-05 21:14:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								839526a913
								
							
						 | 
						
							
							
								
								TwitterAPI: Add network hiding.
							
							
							
							
							
						 | 
						
							2018-12-05 19:22:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba345e4c29
								
							
						 | 
						
							
							
								
								[#210] Formatting fix.
							
							
							
							
							
						 | 
						
							2018-12-05 13:43:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								848151f7cb
								
							
						 | 
						
							
							
								
								[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
							
							
							
							
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 | 
						
							2018-12-05 13:37:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								53797d19c5
								
							
						 | 
						
							
							
								
								[#210] Test update (replaced bang- with non-bang method).
							
							
							
							
							
						 | 
						
							2018-12-05 11:56:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								44ab3dbe2c
								
							
						 | 
						
							
							
								
								[#210] Refactoring.
							
							
							
							
							
						 | 
						
							2018-12-04 19:45:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								826fc446d5
								
							
						 | 
						
							
							
								
								[#210] TwitterAPI: implemented /api/media/metadata/create
							
							
							
							
							
							
							
							to allow uploads description (alt text) setting. 
							
						 | 
						
							2018-12-04 18:35:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								88b05aeabb
								
							
						 | 
						
							
							
								
								Merge branch 'fix/parse-user-bio' into 'develop'
							
							
							
							
							
							
							
							Parse user's bio on register
See merge request pleroma/pleroma!492 
							
						 | 
						
							2018-12-03 16:31:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8148943368
								
							
						 | 
						
							
							
								
								Format files
							
							
							
							
							
						 | 
						
							2018-12-02 22:08:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce98d5eb9b
								
							
						 | 
						
							
							
								
								Parse user's bio on register
							
							
							
							
							
						 | 
						
							2018-12-02 22:03:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c9a4e8b40
								
							
						 | 
						
							
							
								
								TwitterAPI: Implement hide_network.
							
							
							
							
							
						 | 
						
							2018-12-02 18:14:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								91065e1968
								
							
						 | 
						
							
							
								
								Fix background updating / handling.
							
							
							
							
							
						 | 
						
							2018-12-02 11:20:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f18b86fd5f
								
							
						 | 
						
							
							
								
								More fixes for Info schema.
							
							
							
							
							
						 | 
						
							2018-12-01 12:46:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								93f2dc19d9
								
							
						 | 
						
							
							
								
								TwitterAPI: Fix banner and background update.
							
							
							
							
							
						 | 
						
							2018-12-01 12:01:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								48b95a9b95
								
							
						 | 
						
							
							
								
								Assorted fixes.
							
							
							
							
							
						 | 
						
							2018-11-30 17:08:02 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d407f662af
								
							
						 | 
						
							
							
								
								Fix TwitterApiController.
							
							
							
							
							
						 | 
						
							2018-11-30 17:07:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6812bc9df
								
							
						 | 
						
							
							
								
								Remove "most recent notification" endpoint.
							
							
							
							
							
						 | 
						
							2018-11-30 16:47:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ac5d48575
								
							
						 | 
						
							
							
								
								More fixes
							
							
							
							
							
						 | 
						
							2018-11-29 00:25:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbb70d25fe
								
							
						 | 
						
							
							
								
								Several twitter api fixes.
							
							
							
							
							
						 | 
						
							2018-11-18 22:36:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f87b315618
								
							
						 | 
						
							
							
								
								TwitterAPI: Fix dm_timeline displaying only half of the conversation.
							
							
							
							
							
						 | 
						
							2018-11-16 19:47:36 +01:00 | 
						
						
							
							
							
								
							
							
						 |