Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								fc965f982c 
								
							 
						 
						
							
							
								
								[ #477 ] Added FTS index for users. Fixed failing test.  
							
							
							
						 
						
							2019-01-15 12:04:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								11d08c6226 
								
							 
						 
						
							
							
								
								Merge branch 'twapi-follower-pagination' into 'develop'  
							
							... 
							
							
							
							Twapi follower pagination
See merge request pleroma/pleroma!648  
							
						 
						
							2019-01-10 18:03:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5efddd6e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/pinned-posts' into 'develop'  
							
							... 
							
							
							
							Pinned Statuses
Closes  #440 
See merge request pleroma/pleroma!636  
							
						 
						
							2019-01-10 02:39:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a99e156f2c 
								
							 
						 
						
							
							
								
								Add integer casts.  
							
							
							
						 
						
							2019-01-09 18:17:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac152ed38 
								
							 
						 
						
							
							
								
								TwitterAPI: Add follower/following pagination.  
							
							
							
						 
						
							2019-01-09 18:14:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1881680e28 
								
							 
						 
						
							
							
								
								Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'  
							
							... 
							
							
							
							Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647  
							
						 
						
							2019-01-09 16:26:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8df348a3da 
								
							 
						 
						
							
							
								
								Add test for summary_html  
							
							
							
						 
						
							2019-01-09 17:18:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								44a1e69484 
								
							 
						 
						
							
							
								
								Add Twitter API for the pinned statuses  
							
							... 
							
							
							
							```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
``` 
							
						 
						
							2019-01-09 19:54:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b17cc61 
								
							 
						 
						
							
							
								
								Actually put some onformation in the error user, make it actually properly parse  
							
							... 
							
							
							
							in conversations. 
							
						 
						
							2019-01-07 20:59:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7382adf407 
								
							 
						 
						
							
							
								
								Make TwAPI UserView more resilient to issues.  
							
							... 
							
							
							
							Will work for missing users and badly migrated users. 
							
						 
						
							2019-01-07 12:41:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								52493467ac 
								
							 
						 
						
							
							
								
								Twitter API: Add a summary_html field.  
							
							... 
							
							
							
							The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though. 
							
						 
						
							2019-01-06 10:19:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								57df7d6e1d 
								
							 
						 
						
							
							
								
								Add tests for emoji and lack of HTML in summaries.  
							
							
							
						 
						
							2019-01-05 21:46:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								096e121879 
								
							 
						 
						
							
							
								
								Remove redundant comma.  
							
							
							
						 
						
							2019-01-05 18:25:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								6556be344d 
								
							 
						 
						
							
							
								
								Resolve some test failures.  
							
							
							
						 
						
							2019-01-05 18:20:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								90e157ef80 
								
							 
						 
						
							
							
								
								Merge branch 'features/admin-api-user-views' into 'develop'  
							
							... 
							
							
							
							User/Account views: Add rights.admin
Closes  #472 
See merge request pleroma/pleroma!589  
							
						 
						
							2018-12-31 15:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e15d3257 
								
							 
						 
						
							
							
								
								tests: fix a lot of the remaining test failures  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e8570758f9 
								
							 
						 
						
							
							
								
								twitterapi: fix remaining test failures  
							
							
							
						 
						
							2018-12-04 04:52:09 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fe4387077a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/default-scope' into 'develop'  
							
							... 
							
							
							
							default scope setting
See merge request pleroma/pleroma!239  
							
						 
						
							2018-07-12 05:59:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								66819ea784 
								
							 
						 
						
							
							
								
								twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic  
							
							
							
						 
						
							2018-06-27 13:38:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								32211c4ada 
								
							 
						 
						
							
							
								
								tests: add default_scope where appropriate  
							
							
							
						 
						
							2018-06-27 13:17:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6160a1b3c0 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2018-06-24 15:24:41 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								1299bccc7d 
								
							 
						 
						
							
							
								
								return unquoted empty array from /api/qvitter/mutes.json  
							
							
							
						 
						
							2018-06-23 23:20:30 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6316003946 
								
							 
						 
						
							
							
								
								fixes- found that TwitterAPI.Controller adds .json suffix already  
							
							
							
						 
						
							2018-06-23 23:05:54 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8c7fdcb31b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/twitterapi-unrepeat' into 'develop'  
							
							... 
							
							
							
							Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218  
							
						 
						
							2018-06-14 07:19:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								fc15f30a3c 
								
							 
						 
						
							
							
								
								fixup test  
							
							
							
						 
						
							2018-06-13 21:45:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1555c66650 
								
							 
						 
						
							
							
								
								Add unretweet TwAPI endpoint and cleanup AP.unannounce  
							
							
							
						 
						
							2018-06-13 21:33:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								9c1cf1befb 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-06-12 15:01:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Henry Jameson 
								
							 
						 
						
							
							
							
							
								
							
							
								f42ffbe9a8 
								
							 
						 
						
							
							
								
								Initial invites support + tests.  
							
							
							
						 
						
							2018-06-12 14:55:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c773f42ca4 
								
							 
						 
						
							
							
								
								tests: update twitterapi user view tests for new locked variable  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e0942745 
								
							 
						 
						
							
							
								
								twitter api: add approve/deny endpoints  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d116af3bee 
								
							 
						 
						
							
							
								
								tests: add tests for /api/pleroma/friend_requests  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								993312cdb3 
								
							 
						 
						
							
							
								
								twitterapi: add profile setting for locked/unlocked accounts  
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f70e83e8c 
								
							 
						 
						
							
							
								
								Better error handling in TwitterApiController.  
							
							
							
						 
						
							2018-06-03 19:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								935e544e19 
								
							 
						 
						
							
							
								
								TwitterAPI: fix "Follows you" being shown for the wrong user.  
							
							
							
						 
						
							2018-05-31 15:27:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f569b67cda 
								
							 
						 
						
							
							
								
								tests: update for html changes  
							
							
							
						 
						
							2018-05-27 13:03:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c2dcd767cf 
								
							 
						 
						
							
							
								
								Merge branch 'feature/incoming-remote-unfollow' into 'develop'  
							
							... 
							
							
							
							Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158  
							
						 
						
							2018-05-24 19:52:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c41012053a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/change-password' into 'develop'  
							
							... 
							
							
							
							Feature/change password
See merge request pleroma/pleroma!166  
							
						 
						
							2018-05-24 17:16:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								72b93d13f8 
								
							 
						 
						
							
							
								
								Hook up block/unblock to TwitterAPI  
							
							
							
						 
						
							2018-05-22 05:41:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								d0690622cd 
								
							 
						 
						
							
							
								
								Added endpoint for changing passwords  
							
							
							
						 
						
							2018-05-21 23:06:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b 
								
							 
						 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3  
							
							... 
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 
						
							2018-05-20 20:08:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								413de8e4bc 
								
							 
						 
						
							
							
								
								More fixes.  
							
							
							
						 
						
							2018-05-20 19:26:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ff007af0c2 
								
							 
						 
						
							
							
								
								Return visilility in twitter api, too.  
							
							
							
						 
						
							2018-05-20 18:01:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								d1366f8d46 
								
							 
						 
						
							
							
								
								Modified deleting an account to run as a task  
							
							
							
						 
						
							2018-05-19 13:35:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								5bfb7b4ce6 
								
							 
						 
						
							
							
								
								Moved account deletion stuff to somewhere that hopefully makes more sense  
							
							
							
						 
						
							2018-05-13 14:36:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								a16117225f 
								
							 
						 
						
							
							
								
								Added endpoint for user account deletion  
							
							
							
						 
						
							2018-05-13 14:35:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pierrick Brun 
								
							 
						 
						
							
							
							
							
								
							
							
								89603eda9e 
								
							 
						 
						
							
							
								
								do not create notification for yourself  
							
							
							
						 
						
							2018-05-11 11:31:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bc215f5684 
								
							 
						 
						
							
							
								
								Fix format.  
							
							
							
						 
						
							2018-04-29 11:28:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								6908f29e0a 
								
							 
						 
						
							
							
								
								Added a test (written by @andrewzah) for the MR  
							
							
							
						 
						
							2018-04-28 12:01:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a61e8ac154 
								
							 
						 
						
							
							
								
								Formatting.  
							
							
							
						 
						
							2018-04-20 13:10:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								fa37acfcc7 
								
							 
						 
						
							
							
								
								TwitterAPI: Add Qvitter notification endpoint.  
							
							
							
						 
						
							2018-04-19 21:46:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b7ab5d9a 
								
							 
						 
						
							
							
								
								Load all users at once in timelines.  
							
							
							
						 
						
							2018-04-02 16:35:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								360c51f1f5 
								
							 
						 
						
							
							
								
								Use context_ids directly if we have them.  
							
							
							
						 
						
							2018-04-02 15:28:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a4db3a732f 
								
							 
						 
						
							
							
								
								Pre-fetch conversation ids.  
							
							
							
						 
						
							2018-04-02 14:46:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1b57522bba 
								
							 
						 
						
							
							
								
								Fix some test stuff.  
							
							
							
						 
						
							2018-04-02 13:13:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								802736679c 
								
							 
						 
						
							
							
								
								Remove unused ActivityRepresenter module.  
							
							
							
						 
						
							2018-03-30 16:50:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e90f8f6c4b 
								
							 
						 
						
							
							
								
								TwApi ActivityView: Add delete activities.  
							
							
							
						 
						
							2018-03-30 15:32:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1f32ba052c 
								
							 
						 
						
							
							
								
								TwApi ActivityView: Add follows.  
							
							
							
						 
						
							2018-03-30 15:17:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d529ee94 
								
							 
						 
						
							
							
								
								TwApi ActivityView: Add announces.  
							
							
							
						 
						
							2018-03-30 14:46:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1f1caab138 
								
							 
						 
						
							
							
								
								TwApi ActivityView: Add Like rendering.  
							
							
							
						 
						
							2018-03-30 13:49:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								361016349f 
								
							 
						 
						
							
							
								
								Add ActivityViewTest.  
							
							
							
						 
						
							2018-03-30 12:57:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e30752bc79 
								
							 
						 
						
							
							
								
								Add basic activity view.  
							
							
							
						 
						
							2018-03-27 22:24:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								9556c8f6e7 
								
							 
						 
						
							
							
								
								Forgot to fix one of the links in a test  
							
							
							
						 
						
							2018-03-27 02:08:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								5ba2f4b6d8 
								
							 
						 
						
							
							
								
								Update tests to reflect hashtag link changes  
							
							
							
						 
						
							2018-03-27 02:07:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eb7ce61ca5 
								
							 
						 
						
							
							
								
								Fix hashtags.  
							
							
							
						 
						
							2018-03-24 11:03:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8a47974217 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2018-02-25 18:11:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4ea2a41014 
								
							 
						 
						
							
							
								
								Fix more specs.  
							
							
							
						 
						
							2018-02-25 17:48:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								94db9ac4db 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/activitypub  
							
							
							
						 
						
							2018-02-21 18:34:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc810c452 
								
							 
						 
						
							
							
								
								Add moderator function.  
							
							
							
						 
						
							2018-02-20 18:44:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b331cb449a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/activitypub  
							
							
							
						 
						
							2018-02-12 10:24:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26ccb768d3 
								
							 
						 
						
							
							
								
								Make test output easier to read.  
							
							
							
						 
						
							2018-02-12 10:14:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								33a5d0a238 
								
							 
						 
						
							
							
								
								Fix some test warnings.  
							
							
							
						 
						
							2018-02-12 09:33:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ce31f3a922 
								
							 
						 
						
							
							
								
								Twitter Representers: Handle Mastodon attachments.  
							
							
							
						 
						
							2018-02-11 17:21:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								61c16193de 
								
							 
						 
						
							
							
								
								Merge branch 'move-backend-images' into 'develop'  
							
							... 
							
							
							
							Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60  
							
						 
						
							2018-02-03 13:05:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								ea6d1b2b17 
								
							 
						 
						
							
							
								
								move avi.png & banner.png from /priv/static/static to /priv/static/images  
							
							
							
						 
						
							2018-02-03 20:43:14 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								ab83e0de6d 
								
							 
						 
						
							
							
								
								TwitterAPI: Add is_local to user view.  
							
							
							
						 
						
							2018-02-01 21:41:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								b3e7d7ae6d 
								
							 
						 
						
							
							
								
								Fetch external profile in the background.  
							
							
							
						 
						
							2018-01-16 15:31:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								14b086eec2 
								
							 
						 
						
							
							
								
								Add a default profile picture and banner.  
							
							... 
							
							
							
							This removes the placehold.it dependency. 
							
						 
						
							2018-01-15 22:18:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1969773fb4 
								
							 
						 
						
							
							
								
								Fix follower/following lists.  
							
							... 
							
							
							
							Add tests. 
							
						 
						
							2017-12-18 16:37:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								9223038319 
								
							 
						 
						
							
							
								
								Fix some more tests.  
							
							
							
						 
						
							2017-12-11 21:01:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								79b3397c17 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2017-12-11 18:41:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Iwakura 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c2472abd 
								
							 
						 
						
							
							
								
								Fix tests.  
							
							
							
						 
						
							2017-12-05 12:18:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3d29fc5462 
								
							 
						 
						
							
							
								
								Make /api/friends/ids test deterministic.  
							
							
							
						 
						
							2017-11-20 19:16:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								747a68a075 
								
							 
						 
						
							
							
								
								Treat internal emoji like external.  
							
							
							
						 
						
							2017-11-20 17:53:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								edc3e5bc30 
								
							 
						 
						
							
							
								
								Make users in tests follow themselves by default.  
							
							... 
							
							
							
							Also fix the semantics of all tests to match. 
							
						 
						
							2017-11-20 07:52:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								40ca379357 
								
							 
						 
						
							
							
								
								Fix flakey test.  
							
							
							
						 
						
							2017-11-19 13:07:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								fb118b2978 
								
							 
						 
						
							
							
								
								Don't insert newlines to generated HTML.  
							
							... 
							
							
							
							MastoFE doesn't like them. 
							
						 
						
							2017-11-18 14:46:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								66e78c3ec4 
								
							 
						 
						
							
							
								
								Escape HTML instead of discarding it.  
							
							
							
						 
						
							2017-11-18 14:43:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1cca544e20 
								
							 
						 
						
							
							
								
								Merge branch 'twitterapi-bitlbee' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: Add missing endpoints for bitlbee.
Closes  #67 
See merge request pleroma/pleroma!18  
							
						 
						
							2017-11-14 16:47:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f9828e578c 
								
							 
						 
						
							
							
								
								TwitterAPI: Add /users/show.  
							
							
							
						 
						
							2017-11-14 17:34:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3533bf7eac 
								
							 
						 
						
							
							
								
								TwitterAPI: Add /friends/ids.  
							
							
							
						 
						
							2017-11-14 16:04:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f7fc048aeb 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add follows_you.  
							
							
							
						 
						
							2017-11-08 19:13:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								4656cb9b99 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add blocks.  
							
							
							
						 
						
							2017-11-08 13:02:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								6c0758e041 
								
							 
						 
						
							
							
								
								TwitterAPI: Add blocks.  
							
							
							
						 
						
							2017-11-08 00:04:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f85566324e 
								
							 
						 
						
							
							
								
								Allow profile fetching for authenticated users only.  
							
							
							
						 
						
							2017-11-07 00:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								0c871e5c6e 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2017-10-31 17:57:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								04217f52c9 
								
							 
						 
						
							
							
								
								TwitterAPI: Display cws.  
							
							
							
						 
						
							2017-10-31 17:43:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6d5bd4dcc0 
								
							 
						 
						
							
							
								
								TwitterAPI: Use correct endpoint for tag timeline.  
							
							
							
						 
						
							2017-09-17 13:03:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								255a681782 
								
							 
						 
						
							
							
								
								TwitterAPI: Add tag timeline.  
							
							
							
						 
						
							2017-09-17 11:45:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								959e993c7d 
								
							 
						 
						
							
							
								
								Apply incoming custom emoji.  
							
							
							
						 
						
							2017-09-16 16:40:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5d1f8dcd1c 
								
							 
						 
						
							
							
								
								TwitterAPI: Add search.  
							
							
							
						 
						
							2017-09-16 14:33:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								50409326a8 
								
							 
						 
						
							
							
								
								Refactor posting and make character limit configurable.  
							
							
							
						 
						
							2017-09-15 14:17:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d625d8db7d 
								
							 
						 
						
							
							
								
								Add unfav to Mastodon API.  
							
							
							
						 
						
							2017-09-09 18:30:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								454dc18570 
								
							 
						 
						
							
							
								
								Add favoriting to Mastodon API.  
							
							
							
						 
						
							2017-09-09 18:09:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								66e4c710d4 
								
							 
						 
						
							
							
								
								Add reblogging to MastodonAPI.  
							
							
							
						 
						
							2017-09-09 17:48:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c10ad2fb 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2017-09-05 09:35:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf3128a56 
								
							 
						 
						
							
							
								
								Add TwAPI representer for deletes.  
							
							
							
						 
						
							2017-09-04 20:03:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4b03c43fd7 
								
							 
						 
						
							
							
								
								fix specs.  
							
							
							
						 
						
							2017-08-29 17:22:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5142a8efbb 
								
							 
						 
						
							
							
								
								Add profile update.  
							
							
							
						 
						
							2017-08-29 15:14:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								171ef33cbb 
								
							 
						 
						
							
							
								
								More sensible attachment names.  
							
							
							
						 
						
							2017-08-28 19:17:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								67bfa19b35 
								
							 
						 
						
							
							
								
								Set twitter-style possibly_sensitive boolena.  
							
							
							
						 
						
							2017-08-24 16:27:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								5dc278b1a6 
								
							 
						 
						
							
							
								
								Add activity_type to twitter api output.  
							
							
							
						 
						
							2017-08-24 16:18:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								7d34cec58d 
								
							 
						 
						
							
							
								
								escape attachment urls on creation.  
							
							
							
						 
						
							2017-08-09 16:55:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								00b722430f 
								
							 
						 
						
							
							
								
								Revert "Close br tags."  
							
							... 
							
							
							
							This reverts commit 2eba8e74cc 
							
						 
						
							2017-07-31 13:27:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								19e8421947 
								
							 
						 
						
							
							
								
								Revert "Wrap in <p>."  
							
							... 
							
							
							
							This reverts commit c81d0b6f89 
							
						 
						
							2017-07-31 13:27:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								3063e3b440 
								
							 
						 
						
							
							
								
								Revert "Remove newlines completely so mastodon doesn't bug out."  
							
							... 
							
							
							
							This reverts commit 0ca3ab7b59 
							
						 
						
							2017-07-31 13:27:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								0ca3ab7b59 
								
							 
						 
						
							
							
								
								Remove newlines completely so mastodon doesn't bug out.  
							
							
							
						 
						
							2017-07-31 13:06:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								c81d0b6f89 
								
							 
						 
						
							
							
								
								Wrap in <p>.  
							
							
							
						 
						
							2017-07-31 12:16:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2eba8e74cc 
								
							 
						 
						
							
							
								
								Close br tags.  
							
							
							
						 
						
							2017-07-31 10:46:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								72ca58c540 
								
							 
						 
						
							
							
								
								Save follower count and note count in user.  
							
							
							
						 
						
							2017-07-22 17:42:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a027b0027c 
								
							 
						 
						
							
							
								
								Add friends endpoint.  
							
							
							
						 
						
							2017-07-20 20:35:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								94a394e3a8 
								
							 
						 
						
							
							
								
								Add followers endpoint.  
							
							
							
						 
						
							2017-07-20 20:29:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								140f72725d 
								
							 
						 
						
							
							
								
								Use follower address in user entry.  
							
							
							
						 
						
							2017-07-19 19:06:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								7e9647b146 
								
							 
						 
						
							
							
								
								Fix undo activity.  
							
							
							
						 
						
							2017-07-08 11:17:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								e343c0c9c4 
								
							 
						 
						
							
							
								
								Add way to update most recent notification id.  
							
							
							
						 
						
							2017-07-02 15:01:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								201804b836 
								
							 
						 
						
							
							
								
								Only return posts in TwAPI conversations.  
							
							
							
						 
						
							2017-06-30 16:41:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d4de38e8ff 
								
							 
						 
						
							
							
								
								Order conversation fetches like GS does.  
							
							
							
						 
						
							2017-06-30 16:30:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1c074efeaf 
								
							 
						 
						
							
							
								
								Add external links to twapi.  
							
							
							
						 
						
							2017-06-25 12:07:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								069daf644d 
								
							 
						 
						
							
							
								
								Replace UserRepresenter with UserView  
							
							
							
						 
						
							2017-06-20 00:12:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fa82822932 
								
							 
						 
						
							
							
								
								Revert "Add invisible tags to TwAPI output."  
							
							... 
							
							
							
							This reverts commit a92a9dce94 
							
						 
						
							2017-06-18 18:59:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								d00571ff75 
								
							 
						 
						
							
							
								
								Fetch user feed on externalprofile request.  
							
							... 
							
							
							
							This is so we always have something to show. 
							
						 
						
							2017-06-18 17:20:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								fafb765c48 
								
							 
						 
						
							
							
								
								Output tags list in TwAPI.  
							
							
							
						 
						
							2017-06-18 14:43:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								8feec8d390 
								
							 
						 
						
							
							
								
								Strip unsafe html on output in TwAPI.  
							
							
							
						 
						
							2017-06-18 13:40:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								7b41e103e1 
								
							 
						 
						
							
							
								
								Remove html from user bios on display.  
							
							... 
							
							
							
							This is mainly to fix problems of bios coming from mastodong. 
							
						 
						
							2017-06-18 13:17:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								83c657afa5 
								
							 
						 
						
							
							
								
								Do some basic escaping.  
							
							
							
						 
						
							2017-06-14 14:46:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1af9c77736 
								
							 
						 
						
							
							
								
								Move mention parsing to Formatter module.  
							
							
							
						 
						
							2017-06-14 13:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								eb18b9ebba 
								
							 
						 
						
							
							
								
								Enable user timelines.  
							
							
							
						 
						
							2017-06-12 17:12:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								00c032783d 
								
							 
						 
						
							
							
								
								Fix NaN statuses per day.  
							
							
							
						 
						
							2017-06-05 15:47:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								c6aa60c829 
								
							 
						 
						
							
							
								
								Shorten names in links.  
							
							
							
						 
						
							2017-05-30 14:26:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								48f9df2391 
								
							 
						 
						
							
							
								
								Keep newlines around.  
							
							
							
						 
						
							2017-05-18 16:41:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a92a9dce94 
								
							 
						 
						
							
							
								
								Add invisible tags to TwAPI output.  
							
							
							
						 
						
							2017-05-18 16:24:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								0da6ade619 
								
							 
						 
						
							
							
								
								Save tags in object.  
							
							
							
						 
						
							2017-05-18 15:16:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								9033bfffd2 
								
							 
						 
						
							
							
								
								Twitter API refactoring.  
							
							
							
						 
						
							2017-05-17 18:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								423194520e 
								
							 
						 
						
							
							
								
								Fix mention replacing.  
							
							
							
						 
						
							2017-05-15 18:25:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								36448d6483 
								
							 
						 
						
							
							
								
								Add externalprofile to TwAPI.  
							
							
							
						 
						
							2017-05-10 18:44:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1418d72749 
								
							 
						 
						
							
							
								
								Add class=attachment to attachment links.  
							
							
							
						 
						
							2017-05-08 20:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								7303786160 
								
							 
						 
						
							
							
								
								Add some twapi fixes.  
							
							
							
						 
						
							2017-05-07 20:20:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								b403ea4d2b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity  
							
							
							
						 
						
							2017-05-07 19:28:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								95ab0dc3c5 
								
							 
						 
						
							
							
								
								Add conversation ids to twapi announce representer.  
							
							
							
						 
						
							2017-05-07 12:46:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								33c803d6da 
								
							 
						 
						
							
							
								
								Add attachment link to posts.  
							
							
							
						 
						
							2017-05-02 18:25:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								16f8406eb6 
								
							 
						 
						
							
							
								
								Add statusnet_profile_url to the TwAPI.  
							
							
							
						 
						
							2017-05-02 14:36:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								32a95d73da 
								
							 
						 
						
							
							
								
								Add twkn timeline.  
							
							
							
						 
						
							2017-05-02 14:12:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								56bacc90d1 
								
							 
						 
						
							
							
								
								Fix specs, add local marker to actitivies.  
							
							
							
						 
						
							2017-05-02 10:43:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								09f7ed4214 
								
							 
						 
						
							
							
								
								Don't set statusnetConversationIds on replies anymore.  
							
							
							
						 
						
							2017-04-30 14:26:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								009fcd2acf 
								
							 
						 
						
							
							
								
								Stop adding statusnetConversationIds.  
							
							
							
						 
						
							2017-04-30 14:02:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4c8111c334 
								
							 
						 
						
							
							
								
								Use conversation mapping objects to get / retrieve context from TwAPI.  
							
							
							
						 
						
							2017-04-30 13:53:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								22e936372e 
								
							 
						 
						
							
							
								
								Fix retweet spec.  
							
							
							
						 
						
							2017-04-26 08:55:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								42105497ca 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats  
							
							
							
						 
						
							2017-04-24 14:17:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								5b6070ec40 
								
							 
						 
						
							
							
								
								Deny whitespace statuses  
							
							
							
						 
						
							2017-04-24 12:09:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								f723b23691 
								
							 
						 
						
							
							
								
								Add error response to self-repeats  
							
							
							
						 
						
							2017-04-24 01:11:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								6b6bc9435c 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats  
							
							
							
						 
						
							2017-04-24 01:05:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								1e3791877c 
								
							 
						 
						
							
							
								
								Add error response on empty status  
							
							
							
						 
						
							2017-04-23 19:08:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								a9b3f99d48 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-21 18:36:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								1e88f102c4 
								
							 
						 
						
							
							
								
								Fix specs, add some user info.  
							
							
							
						 
						
							2017-04-21 00:51:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								3a56d7318f 
								
							 
						 
						
							
							
								
								Add statuses/mentions endpoint  
							
							
							
						 
						
							2017-04-20 15:18:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								01901d9835 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-20 10:46:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								d952b6cd7b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name  
							
							
							
						 
						
							2017-04-20 10:39:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambadalambda 
								
							 
						 
						
							
							
							
							
								
							
							
								eda742c78b 
								
							 
						 
						
							
							
								
								Merge branch 'feature/user-timeline' into 'develop'  
							
							... 
							
							
							
							Feature/user timeline
See merge request !8  
							
						 
						
							2017-04-19 05:50:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								470f5f7cd6 
								
							 
						 
						
							
							
								
								Add user timeline spec test  
							
							
							
						 
						
							2017-04-17 16:31:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambadalambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ac9817bdb0 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'  
							
							... 
							
							
							
							Add error messages for repeated follows and unfollows
See merge request !7  
							
						 
						
							2017-04-17 05:46:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6a0e69a8a3 
								
							 
						 
						
							
							
								
								Fix syntax error.  
							
							
							
						 
						
							2017-04-17 11:43:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a185ea63af 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop  
							
							
							
						 
						
							2017-04-17 11:37:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfd521974 
								
							 
						 
						
							
							
								
								Switch cache implementation for size limiting.  
							
							
							
						 
						
							2017-04-17 11:36:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								369be708b2 
								
							 
						 
						
							
							
								
								Remove unnecesary queries  
							
							
							
						 
						
							2017-04-16 17:42:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dtluna 
								
							 
						 
						
							
							
							
							
								
							
							
								f6e632d25b 
								
							 
						 
						
							
							
								
								Remove unnecesary asserts  
							
							
							
						 
						
							2017-04-16 17:39:34 +03:00