Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								209395c7e6 
								
							 
						 
						
							
							
								
								Add User.change_info/2 and User.update_info/2  
							
							
							
						 
						
							2019-09-24 19:50:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d8098d142a 
								
							 
						 
						
							
							
								
								added Emoji.Formatter  
							
							
							
						 
						
							2019-08-30 22:04:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b770ed1d99 
								
							 
						 
						
							
							
								
								CommonAPI: Support emoji reactions.  
							
							
							
						 
						
							2019-08-27 17:56:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								efb8818e9e 
								
							 
						 
						
							
							
								
								Activity Expiration: Switch to 'expires_in' system.  
							
							
							
						 
						
							2019-08-24 17:22:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b64b6fee2a 
								
							 
						 
						
							
							
								
								CommonAPI: Replies to conversations also get the correct context id.  
							
							
							
						 
						
							2019-08-05 15:33:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56b1c3af13 
								
							 
						 
						
							
							
								
								CommonAPI: Extend api with conversation replies.  
							
							
							
						 
						
							2019-08-02 15:05:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								36012ef6c1 
								
							 
						 
						
							
							
								
								Require that ephemeral posts live for at least one hour  
							
							... 
							
							
							
							If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them. 
							
						 
						
							2019-07-24 14:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								704960b3c1 
								
							 
						 
						
							
							
								
								Add support for activity expiration to common and Masto API  
							
							... 
							
							
							
							The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not. 
							
						 
						
							2019-07-24 14:45:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							
							
						 
						
							2019-07-15 14:00:29 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							
							
						 
						
							2019-07-14 19:25:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								958fb9aa80 
								
							 
						 
						
							
							
								
								Add "listMessage"  
							
							
							
						 
						
							2019-07-11 16:36:08 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-11 13:26:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5104f65b69 
								
							 
						 
						
							
							
								
								Wrap error messages into gettext helpers  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c60a562a7 
								
							 
						 
						
							
							
								
								Fix not being able to pin unlisted posts  
							
							... 
							
							
							
							Closes  #1038  
						
							2019-06-29 22:27:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								d53fb55bb7 
								
							 
						 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself  
							
							
							
						 
						
							2019-06-26 10:59:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c4e4f7d0e4 
								
							 
						 
						
							
							
								
								Add proper error handling for when the post exceeds character limits  
							
							
							
						 
						
							2019-06-18 05:05:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1370ba131 
								
							 
						 
						
							
							
								
								Utils: Use update_follow_state_for_all when appropriate.  
							
							
							
						 
						
							2019-06-05 16:51:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								076c9ae40e 
								
							 
						 
						
							
							
								
								User: Remove superfluous maybe_follow.  
							
							
							
						 
						
							2019-06-05 14:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa5572d28 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 17:53:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4babb1c9f 
								
							 
						 
						
							
							
								
								Merge branch 'explicit-addressing' into 'develop'  
							
							... 
							
							
							
							Explicit addressing
See merge request pleroma/pleroma!1239  
							
						 
						
							2019-06-05 08:28:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6ba9055b51 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 12:54:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								17383861ed 
								
							 
						 
						
							
							
								
								Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities  
							
							
							
						 
						
							2019-06-04 13:38:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce928d823 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-04 16:28:23 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80d4d83aac 
								
							 
						 
						
							
							
								
								CommonAPI: Add explicit addressing.  
							
							
							
						 
						
							2019-06-03 18:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2fe3a20638 
								
							 
						 
						
							
							
								
								Make error message about author's inability to vote more sensible  
							
							
							
						 
						
							2019-06-02 23:33:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e3c460353d 
								
							 
						 
						
							
							
								
								Refresh the object in CommonAPI.vote instead of MastoAPI controller  
							
							
							
						 
						
							2019-06-02 23:24:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								300d94c628 
								
							 
						 
						
							
							
								
								Add poll votes  
							
							... 
							
							
							
							Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects 
							
						 
						
							2019-06-01 16:17:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f333041a0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-24 21:05:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1d90f9b969 
								
							 
						 
						
							
							
								
								Remove tags/mentions/rich text from poll options because Mastodon and  
							
							... 
							
							
							
							add custom emoji 
							
						 
						
							2019-05-19 17:06:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5ece901af3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects  
							
							
							
						 
						
							2019-05-18 13:37:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fd920c8973 
								
							 
						 
						
							
							
								
								Mastodon API: Add support for posting polls  
							
							
							
						 
						
							2019-05-18 13:29:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dc08159538 
								
							 
						 
						
							
							
								
								also suppress link previews from posts marked #nsfw  
							
							
							
						 
						
							2019-05-17 22:13:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								557f0e33a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-17 19:57:14 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ed682213f 
								
							 
						 
						
							
							
								
								Fix/902 random compile failing  
							
							
							
						 
						
							2019-05-17 07:25:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								fc7246d715 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-16 17:54:24 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a92e701b9 
								
							 
						 
						
							
							
								
								CommonAPI: Visibility refactor.  
							
							
							
						 
						
							2019-05-15 16:35:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e82e73478e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-14 19:00:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								23276e8d68 
								
							 
						 
						
							
							
								
								Use pseudo ap id of a list in BCC  
							
							
							
						 
						
							2019-05-13 16:15:14 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a3dc02d282 
								
							 
						 
						
							
							
								
								Add addressable lists  
							
							
							
						 
						
							2019-05-01 16:11:17 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c3e9fcf098 
								
							 
						 
						
							
							
								
								Fix bookmarks depending on embeded object and move checking if the  
							
							... 
							
							
							
							status is bookmarked to SQL 
							
						 
						
							2019-04-27 23:06:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b09ae02c04 
								
							 
						 
						
							
							
								
								Added some more normalization calls all in mastodon api controller  
							
							
							
						 
						
							2019-04-17 13:04:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								462028688b 
								
							 
						 
						
							
							
								
								Fix pinned posts relying on embded objects  
							
							
							
						 
						
							2019-04-17 12:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								7410aee886 
								
							 
						 
						
							
							
								
								Merge develop to 770-add-emoji-tags  
							
							... 
							
							
							
							Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs 
							
						 
						
							2019-04-06 20:34:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								79cb34a4b0 
								
							 
						 
						
							
							
								
								Fix preview not being usable in form data  
							
							
							
						 
						
							2019-04-02 23:07:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fdb4357e9b 
								
							 
						 
						
							
							
								
								Rename fake param to preview and make the tests check that the object was not inserted to the db  
							
							
							
						 
						
							2019-04-02 14:31:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								3601f03147 
								
							 
						 
						
							
							
								
								Adding tag to emoji ets table  
							
							... 
							
							
							
							changes in apis 
							
						 
						
							2019-04-01 17:17:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb4d5d65b 
								
							 
						 
						
							
							
								
								Implement fake status submit  
							
							
							
						 
						
							2019-03-29 21:59:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a6973a668e 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-03-23 00:28:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e75e43b949 
								
							 
						 
						
							
							
								
								common api: use the optimized Object.normalize whenever possible  
							
							
							
						 
						
							2019-03-23 00:22:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8468f3f6d4 
								
							 
						 
						
							
							
								
								Add safe dm mode option.  
							
							
							
						 
						
							2019-03-20 21:09:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6d6f48d079 
								
							 
						 
						
							
							
								
								Merge branch 'feature/federated-flags' into 'develop'  
							
							... 
							
							
							
							Federated reports
See merge request pleroma/pleroma!935  
							
						 
						
							2019-03-16 19:27:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								da53c079db 
								
							 
						 
						
							
							
								
								Refactor to store user ap_id, add tests  
							
							
							
						 
						
							2019-03-15 14:20:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c8f31e0bc2 
								
							 
						 
						
							
							
								
								Implement mastodon's reblog hiding feature  
							
							
							
						 
						
							2019-03-15 14:18:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c7b774f09 
								
							 
						 
						
							
							
								
								reports: unify sending e-mail for both remote and local reports  
							
							
							
						 
						
							2019-03-14 19:44:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3b48d5f0c2 
								
							 
						 
						
							
							
								
								common api: add support for forwarding reports  
							
							
							
						 
						
							2019-03-14 19:29:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								e416c344dd 
								
							 
						 
						
							
							
								
								Unify unfollow, accept and reject follow requests using CommonAPI  
							
							
							
						 
						
							2019-03-13 20:28:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e 
								
							 
						 
						
							
							
								
								[Credo] make all variables use snake_case  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								2827dfea50 
								
							 
						 
						
							
							
								
								Allow an admin to delete a user status  
							
							
							
						 
						
							2019-03-08 20:21:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								594694607c 
								
							 
						 
						
							
							
								
								Unify Mastodon and Twitter follow implementations using CommonAPI  
							
							
							
						 
						
							2019-03-04 01:00:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								c3ac9424d2 
								
							 
						 
						
							
							
								
								AutoLinker  
							
							
							
						 
						
							2019-02-26 23:32:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								bff9eb5ef7 
								
							 
						 
						
							
							
								
								Reports  
							
							
							
						 
						
							2019-02-20 16:51:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								04b1c13554 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into patch-image-description  
							
							
							
						 
						
							2019-02-14 16:41:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								ac72b578da 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/thread-muting  
							
							
							
						 
						
							2019-02-11 12:10:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c01ef574c1 
								
							 
						 
						
							
							
								
								Refactor as per Rin's suggestions, add endpoint tests  
							
							
							
						 
						
							2019-02-11 12:04:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6 
								
							 
						 
						
							
							
								
								Credo fixes: alias grouping/ordering  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9adc80afff 
								
							 
						 
						
							
							
								
								common api: set directMessage flag on our own posts  
							
							
							
						 
						
							2019-01-20 02:27:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								849c83ed46 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-01-17 16:10:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bc9a641ba 
								
							 
						 
						
							
							
								
								Default to disabled in the code in case the setting is absent from config.exs  
							
							
							
						 
						
							2019-01-17 16:01:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8c368d42a2 
								
							 
						 
						
							
							
								
								Make attachment links configurable  
							
							... 
							
							
							
							Thanks @href! 
							
						 
						
							2019-01-17 15:48:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b594a54d0c 
								
							 
						 
						
							
							
								
								unpin when deleting a status  
							
							
							
						 
						
							2019-01-11 12:31:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b06e6fdf3 
								
							 
						 
						
							
							
								
								only non-reblogs, self-authored, public statuses can be pinned  
							
							
							
						 
						
							2019-01-09 17:40:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								380e9fba21 
								
							 
						 
						
							
							
								
								add pinned posts  
							
							
							
						 
						
							2019-01-07 20:45:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								3c86d907d4 
								
							 
						 
						
							
							
								
								add some brakets to the emoji list.  
							
							
							
						 
						
							2019-01-05 17:35:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								0787f0dfbe 
								
							 
						 
						
							
							
								
								Strip HTML in and allow emoji in summaries.  
							
							
							
						 
						
							2019-01-05 17:28:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								ba93396649 
								
							 
						 
						
							
							
								
								Patch to support image descriptions in Pleroma FE  
							
							
							
						 
						
							2019-01-04 16:27:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wim Vanderbauwhede 
								
							 
						 
						
							
							
							
							
								
							
							
								4c95545d19 
								
							 
						 
						
							
							
								
								Patch to support image descriptions in Pleroma FE  
							
							
							
						 
						
							2019-01-04 15:35:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								be70272ab0 
								
							 
						 
						
							
							
								
								Treat only true and "true" as true  
							
							
							
						 
						
							2018-12-27 13:21:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1ca080c862 
								
							 
						 
						
							
							
								
								Prevent accidental double RTs or favorites  
							
							
							
						 
						
							2018-12-14 07:56:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d6e65f9304 
								
							 
						 
						
							
							
								
								common api: fix up improper Object.normalize() calls  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b266163b 
								
							 
						 
						
							
							
								
								common api: fetch visibility from normalized object  
							
							
							
						 
						
							2018-12-04 04:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6f0b9a5163 
								
							 
						 
						
							
							
								
								Fix Notification tests.  
							
							
							
						 
						
							2018-11-20 19:15:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf358d7b4 
								
							 
						 
						
							
							
								
								activitypub: use Object.delete() instead of mutating the database and cache directly  
							
							
							
						 
						
							2018-11-01 07:29:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								558e6a84d6 
								
							 
						 
						
							
							
								
								[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/346  
							
						 
						
							2018-11-01 06:52:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47f76bf4b1 
								
							 
						 
						
							
							
								
								common api: allow self-liking objects  
							
							... 
							
							
							
							mastodon allows this, for whatever reason.
closes  #347 . 
							
						 
						
							2018-10-31 22:29:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								111841ad34 
								
							 
						 
						
							
							
								
								common api: take the combination of the subject and content for length limit enforcement  
							
							... 
							
							
							
							closes  #315  
						
							2018-10-10 07:53:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								285ac80c36 
								
							 
						 
						
							
							
								
								config: allow for accepted post formats to be configured  
							
							
							
						 
						
							2018-10-05 21:02:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b1be9415ef 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-a26d5e6b' into 'develop'"  
							
							... 
							
							
							
							This reverts commit d31bbb1cfe340ab3cb90 
							
						 
						
							2018-10-05 20:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								58539e1357 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/rich-text' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !309  
							
						 
						
							2018-08-31 09:51:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa65b68b8 
								
							 
						 
						
							
							
								
								common api: add support for formatting messages outside of twitter-style plain text  
							
							
							
						 
						
							2018-08-31 03:13:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								741c6ad671 
								
							 
						 
						
							
							
								
								common api: handle replying to orphaned threads  
							
							
							
						 
						
							2018-08-26 22:37:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d13558c8 
								
							 
						 
						
							
							
								
								CommonAPI: add emoji to user source data on update  
							
							
							
						 
						
							2018-08-13 15:27:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								49da04c509 
								
							 
						 
						
							
							
								
								common api: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								9e0dd21ed6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into feature/unrepeats  
							
							
							
						 
						
							2018-04-25 00:46:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0574df273c 
								
							 
						 
						
							
							
								
								Small cleanup.  
							
							
							
						 
						
							2018-04-22 10:01:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								b949577472 
								
							 
						 
						
							
							
								
								Add unrepeat functionality  
							
							
							
						 
						
							2018-04-14 20:19:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								675839e13c 
								
							 
						 
						
							
							
								
								Fix TwApi reply visibility.  
							
							
							
						 
						
							2018-03-30 12:19:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e9de04b74b 
								
							 
						 
						
							
							
								
								Add support for outgoing update.  
							
							
							
						 
						
							2018-02-25 21:08:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8a47974217 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2018-02-25 18:11:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								94db9ac4db 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/activitypub  
							
							
							
						 
						
							2018-02-21 18:34:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eec6a87dbb 
								
							 
						 
						
							
							
								
								Allow moderators to delete posts.  
							
							
							
						 
						
							2018-02-20 18:54:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2997fe1ba9 
								
							 
						 
						
							
							
								
								CommonAPI: If no visibility is given, return parent visibility.  
							
							
							
						 
						
							2018-02-18 15:04:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4b08dd838 
								
							 
						 
						
							
							
								
								MastodonAPI: Post with visibility settings  
							
							
							
						 
						
							2018-02-18 14:56:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								05ba6ca1b8 
								
							 
						 
						
							
							
								
								Do some transmogrifying for the output.  
							
							
							
						 
						
							2018-02-17 14:11:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ae26604378 
								
							 
						 
						
							
							
								
								ActivityPub: Refactor create function.  
							
							
							
						 
						
							2018-02-15 19:59:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								5436dbaeaf 
								
							 
						 
						
							
							
								
								MastoAPI: don't add attachment links.  
							
							
							
						 
						
							2017-12-07 20:44:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								747a68a075 
								
							 
						 
						
							
							
								
								Treat internal emoji like external.  
							
							
							
						 
						
							2017-11-20 17:53:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f53cdabcdf 
								
							 
						 
						
							
							
								
								Add #nsfw tag if sensitive content bit is set  
							
							
							
						 
						
							2017-11-18 16:30:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								722c4614ad 
								
							 
						 
						
							
							
								
								Allow self-rt.  
							
							
							
						 
						
							2017-11-07 16:45:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								e014cc6ed8 
								
							 
						 
						
							
							
								
								Allow using cws in mastodon api.  
							
							
							
						 
						
							2017-10-31 19:44:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4dcbb64f19 
								
							 
						 
						
							
							
								
								Avoid potentially slow count queries for user note count.  
							
							... 
							
							
							
							For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query. 
							
						 
						
							2017-10-31 16:37:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								270c903220 
								
							 
						 
						
							
							
								
								Add tag links.  
							
							
							
						 
						
							2017-09-17 15:21:44 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								4dc517a0bb 
								
							 
						 
						
							
							
								
								Add deletion to masto api.  
							
							
							
						 
						
							2017-09-09 13:56:51 +02:00