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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								27aa136aac
								
							
						 | 
						
							
							
								
								Format.
							
							
							
							
							
						 | 
						
							2018-11-14 20:41:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b170cd616
								
							
						 | 
						
							
							
								
								Add Pleroma user search api for PleromaFE.
							
							
							
							
							
						 | 
						
							2018-11-14 20:33:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea9a776d7b
								
							
						 | 
						
							
							
								
								TwitterApi: Add direct message endpoint
							
							
							
							
							
						 | 
						
							2018-11-13 20:08:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								db78c72868
								
							
						 | 
						
							
							
								
								Twitter API: Add tests for nil names.
							
							
							
							
							
						 | 
						
							2018-11-12 17:02:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								719a8a1f82
								
							
						 | 
						
							
							
								
								tests: flip testing to/cc for mentions
							
							
							
							
							
						 | 
						
							2018-11-08 19:17:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d675b8a16f
								
							
						 | 
						
							
							
								
								tests: add tests for twitterapi endpoint
							
							
							
							
							
						 | 
						
							2018-11-06 23:25:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								013f7ba8c1
								
							
						 | 
						
							
							
								
								Add federating plug & public tests
							
							
							
							
							
						 | 
						
							2018-11-06 14:45:04 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cfba7db8d
								
							
						 | 
						
							
							
								
								tests: twitterapi: add additional fields
							
							
							
							
							
						 | 
						
							2018-10-25 04:06:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								9563f3766d
								
							
						 | 
						
							
							
								
								tests: update for new in_reply_to_screen_name field
							
							
							
							
							
						 | 
						
							2018-10-25 03:03:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a74daabfae
								
							
						 | 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
							
							
							
							
							
						 | 
						
							2018-09-28 11:17:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								82b57ebad1
								
							
						 | 
						
							
							
								
								[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
							
							
							
							
							
						 | 
						
							2018-09-28 10:44:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								56577d8b48
								
							
						 | 
						
							
							
								
								twitter api: add no_rich_text option to userview for account prefs
							
							
							
							
							
						 | 
						
							2018-09-22 03:24:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7923aa304
								
							
						 | 
						
							
							
								
								Merge branch 'hotfix_broken_likes' into 'develop'
							
							
							
							
							
							
							
							hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284 
							
						 | 
						
							2018-09-02 12:37:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								834515fb51
								
							
						 | 
						
							
							
								
								formatter: don't add XSS emoji
							
							
							
							
							
						 | 
						
							2018-09-02 00:04:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Henry Jameson
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f1c629d65
								
							
						 | 
						
							
							
								
								better solution, added test.
							
							
							
							
							
						 | 
						
							2018-08-27 17:07:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f5bff8c66
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 | 
						
							2018-08-26 21:06:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								aab2bdddf4
								
							
						 | 
						
							
							
								
								twitter api: provide object descriptions as attachment description field
							
							
							
							
							
						 | 
						
							2018-08-25 00:12:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ensra
								
							 
						 | 
						
							
							
							
							
								
							
							
								e883587cc3
								
							
						 | 
						
							
							
								
								this should be looking at the follower's bio, not the user's bio.
							
							
							
							
							
							
							
							fixes test. 
							
						 | 
						
							2018-08-21 15:25:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ensra
								
							 
						 | 
						
							
							
							
							
								
							
							
								f533daffdb
								
							
						 | 
						
							
							
								
								sync bio sanitization code in tests
							
							
							
							
							
						 | 
						
							2018-08-21 15:24:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								13440a80e1
								
							
						 | 
						
							
							
								
								Merge branch 'feature/invites' into 'develop'
							
							
							
							
							
							
							
							Invites
Closes #108
See merge request pleroma/pleroma!208 
							
						 | 
						
							2018-08-12 12:04:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed9738e031
								
							
						 | 
						
							
							
								
								Add tests for emoji in user profiles
							
							
							
							
							
							
							
							Also use the correct field in TwitterAPI... 
							
						 | 
						
							2018-08-08 09:24:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								cee63ad3f7
								
							
						 | 
						
							
							
								
								TwitterAPI user view: add screen_name_html and description_html.
							
							
							
							
							
						 | 
						
							2018-08-08 08:38:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3026177206
								
							
						 | 
						
							
							
								
								test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
							
							
							
							
							
						 | 
						
							2018-08-06 11:29:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4fb64c1d86
								
							
						 | 
						
							
							
								
								testsuite: twitter api: add summary where necessary
							
							
							
							
							
						 | 
						
							2018-07-12 16:12:25 +00:00 | 
						
						
							
							
							
								
							
							
						 |