Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								f13d6c7f78 
								
							 
						 
						
							
							
								
								update api to set skip_thread_containment  
							
							
							
						 
						
							2019-06-03 21:02:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								c5d0fffeaf 
								
							 
						 
						
							
							
								
								naming fix  
							
							
							
						 
						
							2019-04-13 14:55:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								fe13a1d78c 
								
							 
						 
						
							
							
								
								adding notify_email setting for trigger emails  
							
							
							
						 
						
							2019-04-10 17:57:41 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								20c619f85f 
								
							 
						 
						
							
							
								
								replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests  
							
							
							
						 
						
							2019-04-02 17:58:32 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9a59c26619 
								
							 
						 
						
							
							
								
								replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)  
							
							
							
						 
						
							2019-04-02 17:47:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								11c2d6bdc4 
								
							 
						 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id) in tests  
							
							
							
						 
						
							2019-04-02 17:08:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b3d921921 
								
							 
						 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)  
							
							
							
						 
						
							2019-04-02 17:01:26 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								aacdcac1be 
								
							 
						 
						
							
							
								
								Credo is upset about me not remembering the alphabet  
							
							
							
						 
						
							2019-03-26 17:35:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								087662d4fb 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2019-03-26 17:18:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								406d19331f 
								
							 
						 
						
							
							
								
								Remove ActivityRepresenter  
							
							
							
						 
						
							2019-03-26 17:16:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c8743d0c0 
								
							 
						 
						
							
							
								
								[Credo] Fix the warnings  
							
							
							
						 
						
							2019-03-13 04:17:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								86e4b48a5e 
								
							 
						 
						
							
							
								
								Fix DM visibility for blocking users  
							
							
							
						 
						
							2019-03-04 06:24:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d5418e9ff7 
								
							 
						 
						
							
							
								
								Remove follow_request_count as it's not needed for FE anymore.  
							
							... 
							
							
							
							MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load. 
							
						 
						
							2019-03-03 18:42:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9c6abec4d8 
								
							 
						 
						
							
							
								
								use commonapi.post instead of activitybulder  
							
							
							
						 
						
							2019-03-01 15:48:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1341ee650e 
								
							 
						 
						
							
							
								
								[ #675 ] Do not show DMs in mentions timeline  
							
							
							
						 
						
							2019-03-01 09:37:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								337367d764 
								
							 
						 
						
							
							
								
								[ #468 ] More OAuth scopes-specific tests.  
							
							
							
						 
						
							2019-02-20 12:27:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								04ee877a20 
								
							 
						 
						
							
							
								
								[ #468 ] Added OAuth scopes-specific tests.  
							
							
							
						 
						
							2019-02-19 22:28:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7456338ed3 
								
							 
						 
						
							
							
								
								Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'  
							
							... 
							
							
							
							Add OAuth tokens endpoint
See merge request pleroma/pleroma!805  
							
						 
						
							2019-02-18 04:02:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								cd019a5927 
								
							 
						 
						
							
							
								
								Merge branch 'follow-request-count' into 'develop'  
							
							... 
							
							
							
							Follow request count
See merge request pleroma/pleroma!817  
							
						 
						
							2019-02-18 04:01:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								fd17a0cc9b 
								
							 
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2019-02-18 00:10:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								38e15930cb 
								
							 
						 
						
							
							
								
								Add option to return all friends in twitter api.  
							
							... 
							
							
							
							Mainly useful for user export. 
							
						 
						
							2019-02-16 17:01:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								ecdf0657ba 
								
							 
						 
						
							
							
								
								Add logic for keeping follow_request_count up-to-date on the follow,  
							
							... 
							
							
							
							`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. 
							
						 
						
							2019-02-15 12:20:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								62a45bdc11 
								
							 
						 
						
							
							
								
								Add revoke token  
							
							
							
						 
						
							2019-02-13 12:59:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								61a4bc5095 
								
							 
						 
						
							
							
								
								Add OAuth tokens endpoint  
							
							
							
						 
						
							2019-02-13 12:59:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38 
								
							 
						 
						
							
							
								
								test: de-group alias/es  
							
							
							
						 
						
							2019-02-11 03:44:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74518d0b60 
								
							 
						 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE  
							
							... 
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 
						
							2019-02-06 22:34:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								035eaeb9b8 
								
							 
						 
						
							
							
								
								Allow to configure visibility for admin and moderator badges  
							
							
							
						 
						
							2019-02-06 06:18:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e968f9ef2 
								
							 
						 
						
							
							
								
								Format  
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c 
								
							 
						 
						
							
							
								
								Flake Ids for Users and Activities  
							
							
							
						 
						
							2019-01-23 11:26:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f3045a179e 
								
							 
						 
						
							
							
								
								Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'  
							
							... 
							
							
							
							I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685  
							
						 
						
							2019-01-20 10:24:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8f55ab8e 
								
							 
						 
						
							
							
								
								[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).  
							
							
							
						 
						
							2019-01-18 10:35:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85a5be6220 
								
							 
						 
						
							
							
								
								tests: fixup  
							
							
							
						 
						
							2019-01-16 04:09:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								6e9a15b181 
								
							 
						 
						
							
							
								
								[ #483 ] Blocked users export for TwitterAPI.  
							
							
							
						 
						
							2018-12-28 21:08:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								d8cc96cb1f 
								
							 
						 
						
							
							
								
								Fix Twitter timelines for private instances  
							
							
							
						 
						
							2018-12-27 22:43:40 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vyr Cossont 
								
							 
						 
						
							
							
							
							
								
							
							
								e4562105e7 
								
							 
						 
						
							
							
								
								Implement exclude_reblogs and include_rts  
							
							
							
						 
						
							2018-12-26 21:38:00 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3c08d229db 
								
							 
						 
						
							
							
								
								tests: add legal boilerplate  
							
							
							
						 
						
							2018-12-23 20:57:10 +00:00