| 
								
								
									 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 | ddd4a09b72 | Fix merge conflict | 2019-06-05 17:55:00 +07: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 | 5f67c26baf | Accept strings in expires_in because sasuga javascript | 2019-05-21 17:30:51 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a53d062730 | Fix posting non-polls from mastofe | 2019-05-21 14:19:03 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3f96b3e4b8 | Enforce poll limits and add error handling for MastodonAPI's post endpoint | 2019-05-21 10:54:20 +03: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 | c4a55e167a | add Changelog entry | 2019-05-17 23:00:14 +00: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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f2936e0a07 | Add ap_idto List | 2019-05-17 19:56:37 +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 |  | 
				
					
						| 
								
								
									 William Pitcock | 501af917b5 | add support for bbcode | 2019-04-26 22:35:02 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | d21d921def | Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading | 2019-04-22 11:27:29 +03:00 |  | 
				
					
						| 
								
								
									 Egor | b9cdf6d3b9 | Use User.get_cached*everywhere | 2019-04-22 07:20:43 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | a53b917e7f | oof | 2019-04-17 14:55:26 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | ad681877df | Make credo happy | 2019-04-17 14:52:01 +03: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 |  | 
				
					
						| 
								
								
									 rinpatch | 5d73dca064 | Remove inReplyToStatusId | 2019-04-15 11:50:36 +03:00 |  | 
				
					
						| 
								
								
									 Egor | f9af90c5aa | Revert "simplify mentions escape" This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1. | 2019-04-12 19:25:53 +00:00 |  | 
				
					
						| 
								
								
									 Sadposter | be8350baa2 | Merge branch 'develop' into feature/user-status-subscriptions | 2019-04-10 10:44:54 +01:00 |  |