Sergey Suprunenko
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0865f36965
								
							
						 | 
						
							
							
								
								Mark notifications about statuses from muted users as read automatically
							
							
							
							
							
						 | 
						
							2020-08-15 15:27:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7e6f43c0d7
								
							
						 | 
						
							
							
								
								Add is_muted to notifications
							
							
							
							
							
						 | 
						
							2020-06-22 19:03:04 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								b15cfc3d36
								
							
						 | 
						
							
							
								
								Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
							
							
							
							
							
						 | 
						
							2020-06-14 18:27:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca0e6e702b
								
							
						 | 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference
							
							
							
							
							
						 | 
						
							2020-06-06 11:51:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3ccd50a33
								
							
						 | 
						
							
							
								
								ChatMessageReferences: Adjust views
							
							
							
							
							
						 | 
						
							2020-06-03 12:49:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee35bb5ac2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
							
							
							
							
							
						 | 
						
							2020-05-25 13:57:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								23e248694d
								
							
						 | 
						
							
							
								
								Announcements: Fix all tests.
							
							
							
							
							
						 | 
						
							2020-05-21 13:16:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c17109765
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
							
							
							
							
							
						 | 
						
							2020-05-17 12:14:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cff4e24cd
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
							
							
							
							
							
						 | 
						
							2020-05-13 12:44:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd2fb2bb2e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs 
							
						 | 
						
							2020-05-13 12:42:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for StatusController
							
							
							
							
							
						 | 
						
							2020-05-13 00:25:21 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aee88d11be
								
							
						 | 
						
							
							
								
								[#2456] Removed support for embedded relationships in account view.
							
							
							
							
							
						 | 
						
							2020-05-10 09:16:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2924ab1fb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
						 | 
						
							2020-05-08 21:37:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7637ef4203
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
							
							
							
							
							
						 | 
						
							2020-05-08 13:13:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								db55dc9445
								
							
						 | 
						
							
							
								
								ActivityPub: Remove react_with_emoji.
							
							
							
							
							
						 | 
						
							2020-05-05 12:28:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5cdc907e3
								
							
						 | 
						
							
							
								
								Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
							
							
							
							
							
							
							
							Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests. 
							
						 | 
						
							2020-05-01 18:45:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c845820911
								
							
						 | 
						
							
							
								
								Notifications: Create a chat notification.
							
							
							
							
							
						 | 
						
							2020-04-17 16:55:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								349b9d86dc
								
							
						 | 
						
							
							
								
								Merge branch 'remake-remodel-2' into 'develop'
							
							
							
							
							
							
							
							Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315 
							
						 | 
						
							2020-04-06 11:59:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-30 12:15:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								460e41585c
								
							
						 | 
						
							
							
								
								Further preloading (more endpoints), refactoring, tests.
							
							
							
							
							
						 | 
						
							2020-03-25 20:33:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1aa8aa7d7f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
							
							
							
							
							
						 | 
						
							2020-03-20 14:52:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c2c32b460
								
							
						 | 
						
							
							
								
								Merge branch 'remake-remodel' into develop
							
							
							
							
							
						 | 
						
							2020-03-19 18:00:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f9ecb513fa
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into gun
							
							
							
							
							
						 | 
						
							2020-03-18 14:08:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f3791add99
								
							
						 | 
						
							
							
								
								removing with_move parameter
							
							
							
							
							
						 | 
						
							2020-03-16 20:07:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f0753eed0f
								
							
						 | 
						
							
							
								
								removing try block in tesla request
							
							
							
							
							
							
							
							added mocks for tests which fail with Tesla.Mock.Error 
							
						 | 
						
							2020-03-05 17:31:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Soykaf
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a79f20c21
								
							
						 | 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts
							
							
							
							
							
						 | 
						
							2020-02-06 18:09:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								615b72238e
								
							
						 | 
						
							
							
								
								Notifications: Add emoji reaction notifications
							
							
							
							
							
						 | 
						
							2020-01-22 20:06:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4953474ac
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into improve-move-notificaions-api
							
							
							
							
							
						 | 
						
							2019-12-05 14:55:48 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9993acdbb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
							
							
							
							
							
						 | 
						
							2019-12-04 16:35:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed7f850ad2
								
							
						 | 
						
							
							
								
								fix test
							
							
							
							
							
						 | 
						
							2019-12-04 16:22:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								624e720aa4
								
							
						 | 
						
							
							
								
								Add with_move query param to the notifications API
							
							
							
							
							
						 | 
						
							2019-12-03 22:13:38 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1fc28a4b44
								
							
						 | 
						
							
							
								
								Add a view for the move notification
							
							
							
							
							
						 | 
						
							2019-11-27 17:52:02 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e4f52f8a2
								
							
						 | 
						
							
							
								
								Introduce new ingestion pipeline structure, implement internal Likes with it.
							
							
							
							
							
						 | 
						
							2019-10-16 16:16:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5dc14c89ce
								
							
						 | 
						
							
							
								
								notification_view.ex: Make sure account isn’t empty
							
							
							
							
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1203 
							
						 | 
						
							2019-10-04 07:11:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e7aef27c00
								
							
						 | 
						
							
							
								
								Fix merge
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								98d1347a4e
								
							
						 | 
						
							
							
								
								Extract status actions from MastodonAPIController into StatusController
							
							
							
							
							
						 | 
						
							2019-09-27 10:51:15 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed in 2019
							
							
							
							
							
							
							
							Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 | 
						
							2019-09-18 23:21:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								019ced0558
								
							
						 | 
						
							
							
								
								Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
							
							
							
							
							
						 | 
						
							2019-08-26 19:37:57 +07:00 | 
						
						
							
							
							
								
							
							
						 |