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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02
								
							
						 | 
						
							
							
								
								formatter.ex: Add get_emoji_map/1
							
							
							
							
							
						 | 
						
							2019-05-03 16:27:50 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								589629cf3e
								
							
						 | 
						
							
							
								
								Used cached user resources in subscriptions
							
							
							
							
							
						 | 
						
							2019-04-08 15:56:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								76fdfd1c7f
								
							
						 | 
						
							
							
								
								Add check on activity visibility in sub notification
							
							
							
							
							
						 | 
						
							2019-04-07 15:11:29 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ca91cbb87
								
							
						 | 
						
							
							
								
								Change relationship direction of subscriptions
							
							
							
							
							
						 | 
						
							2019-04-05 17:02:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								316fe20d86
								
							
						 | 
						
							
							
								
								Make subscriptions the same direction as blocks
							
							
							
							
							
							
							
							That being, user - subscribes to -> users, rather than
user - has subscribers -> users 
							
						 | 
						
							2019-04-05 15:30:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								007762e767
								
							
						 | 
						
							
							
								
								Add notification checks
							
							
							
							
							
						 | 
						
							2019-04-05 15:30:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								79cb34a4b0
								
							
						 | 
						
							
							
								
								Fix preview not being usable in form data
							
							
							
							
							
						 | 
						
							2019-04-02 23:07:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								256b492a58
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/wrong-date-format' into 'develop'
							
							
							
							
							
							
							
							Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004 
							
						 | 
						
							2019-04-02 14:18:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ce94dd4
								
							
						 | 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'
							
							
							
							
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995 
							
						 | 
						
							2019-04-02 14:17:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e0567ec52
								
							
						 | 
						
							
							
								
								Merge develop into feature/770-add-emoji-tags
							
							
							
							
							
						 | 
						
							2019-04-02 19:16:29 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b3d921921
								
							
						 | 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 17:01:26 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4212527928
								
							
						 | 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id)
							
							
							
							
							
						 | 
						
							2019-04-02 16:50:31 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3db9235150
								
							
						 | 
						
							
							
								
								Ignore dates in wrong formats
							
							
							
							
							
						 | 
						
							2019-04-02 11:32:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b6f9f7b8aa
								
							
						 | 
						
							
							
								
								Handle dates in the Unix timestamp format (Fixes #763)
							
							
							
							
							
						 | 
						
							2019-04-01 22:45:24 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c3d3d0c2b
								
							
						 | 
						
							
							
								
								Merge branch 'safe-mentions' into 'develop'
							
							
							
							
							
							
							
							Add safe dm mode option.
See merge request pleroma/pleroma!958 
							
						 | 
						
							2019-03-22 00:50:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								fea3696799
								
							
						 | 
						
							
							
								
								common api: move context functions from twitterapi
							
							
							
							
							
						 | 
						
							2019-03-21 23:24:04 +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 | 
						
						
							
							
							
								
							
							
						 |