marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ef8e1776d
								
							
						 | 
						
							
							
								
								fix the fucking list timelines on mastofe/soapbox-fe
							
							
							
							
							
						 | 
						
							2021-07-02 13:03:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								45b7325b9e
								
							
						 | 
						
							
							
								
								Refactor skipped plugs into Pleroma.Web functions
							
							
							
							
							
							
							
							Speeds up recompilation by reducing compile cycles 
							
						 | 
						
							2021-06-08 19:15:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7c96c82b5b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-views
							
							
							
							
							
						 | 
						
							2021-05-29 12:17:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c9e4200ed2
								
							
						 | 
						
							
							
								
								Create real Views for all Controllers
							
							
							
							
							
							
							
							This makes views depend on each other at runtime instead of compile-time 
							
						 | 
						
							2021-05-29 12:15:57 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f8785fd9b
								
							
						 | 
						
							
							
								
								[#3213] Performance optimization of filtering by hashtags ("any" condition).
							
							
							
							
							
						 | 
						
							2021-03-07 11:33:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e14945670
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/activity_pub/activity_pub.ex 
							
						 | 
						
							2021-02-03 09:31:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a
								
							
						 | 
						
							
							
								
								list timeline filtration by params
							
							
							
							
							
						 | 
						
							2021-02-01 14:11:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3110c46f3
								
							
						 | 
						
							
							
								
								expanding filtration for home timeline
							
							
							
							
							
							
							
							added local & remote statuses filtration for home timeline 
							
						 | 
						
							2021-02-01 14:11:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								380d0cce6b
								
							
						 | 
						
							
							
								
								[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
							
							
							
							
							
						 | 
						
							2021-01-29 00:17:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb41bd1a85
								
							
						 | 
						
							
							
								
								Hide reactions from muted and blocked users
							
							
							
							
							
						 | 
						
							2020-11-16 22:50:14 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								755f58168b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into restrict-domain
							
							
							
							
							
						 | 
						
							2020-10-13 19:26:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								011525a3d1
								
							
						 | 
						
							
							
								
								EnsurePublicOrAuthenticatedPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e
								
							
						 | 
						
							
							
								
								RateLimiter module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3f9263fb16
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into restrict-origin
							
							
							
							
							
						 | 
						
							2020-10-08 17:24:09 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cfc99fe05c
								
							
						 | 
						
							
							
								
								TimelineController: Keys are atoms now.
							
							
							
							
							
							
							
							Closes #2078
Closes #2070 
							
						 | 
						
							2020-08-26 15:37:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								95529ab709
								
							
						 | 
						
							
							
								
								[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
							
							
							
							
							
						 | 
						
							2020-08-14 20:55:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								afa8b469ed
								
							
						 | 
						
							
							
								
								Allow restricting public timeline by instance
							
							
							
							
							
						 | 
						
							2020-07-18 19:35:07 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6495f4a68
								
							
						 | 
						
							
							
								
								[#1895] credo fix.
							
							
							
							
							
						 | 
						
							2020-07-08 12:54:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f8370a285
								
							
						 | 
						
							
							
								
								[#1895] Applied code review suggestion.
							
							
							
							
							
						 | 
						
							2020-07-08 12:36:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e08e77151
								
							
						 | 
						
							
							
								
								[#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting.
							
							
							
							
							
						 | 
						
							2020-07-07 20:37:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e411372d0
								
							
						 | 
						
							
							
								
								ActivityPub: Don't show announces of your own objects in timeline.
							
							
							
							
							
						 | 
						
							2020-06-10 12:10:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b02df1803e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
							
							
							
							
							
						 | 
						
							2020-06-05 23:15:10 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d74985af23
								
							
						 | 
						
							
							
								
								Merge branch 'features/apc2s-pagination' into 'develop'
							
							
							
							
							
							
							
							Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491 
							
						 | 
						
							2020-06-05 14:52:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61
								
							
						 | 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options
							
							
							
							
							
						 | 
						
							2020-06-04 21:36:26 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4d4b92f75
								
							
						 | 
						
							
							
								
								TimelineController: Only return Create in public timelines.
							
							
							
							
							
						 | 
						
							2020-06-01 13:17:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b3b367b894
								
							
						 | 
						
							
							
								
								Bugfix: Reuse Controller.Helper pagination for APC2S
							
							
							
							
							
						 | 
						
							2020-05-29 16:14:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								33b798425f
								
							
						 | 
						
							
							
								
								[#2456] Post-merge fix.
							
							
							
							
							
						 | 
						
							2020-05-13 12:50:52 +03: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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3bde0fa3f6
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for TimelineController
							
							
							
							
							
						 | 
						
							2020-05-11 15:43:03 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								14a49a0483
								
							
						 | 
						
							
							
								
								[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
							
							
							
							
							
						 | 
						
							2020-05-09 18:05:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								908cf22a6c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 | 
						
							2020-04-28 19:56:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d89cd0a197
								
							
						 | 
						
							
							
								
								Reply Filtering: Refactor.
							
							
							
							
							
						 | 
						
							2020-04-24 18:25:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00e62161f6
								
							
						 | 
						
							
							
								
								[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
							
							
							
							
							
						 | 
						
							2020-04-24 16:52:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e625a427c
								
							
						 | 
						
							
							
								
								reply filtering
							
							
							
							
							
						 | 
						
							2020-04-24 15:43:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2958a7d246
								
							
						 | 
						
							
							
								
								Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
							
							
							
							
							
						 | 
						
							2020-04-22 18:50:25 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f685cbd309
								
							
						 | 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
							
							
							
							
							
						 | 
						
							2020-04-21 16:29:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f2bd7fe72
								
							
						 | 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
							
							
							
							
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 | 
						
							2020-04-01 19:49:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15
								
							
						 | 
						
							
							
								
								restrict_unauthenticated setting
							
							
							
							
							
						 | 
						
							2020-03-20 16:36:20 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5465bf385
								
							
						 | 
						
							
							
								
								timeline controller: add a TODO for replacing copypaste with a macro
							
							
							
							
							
						 | 
						
							2020-03-01 02:03:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffcebe7e22
								
							
						 | 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
							
							
							
							
							
						 | 
						
							2020-03-01 01:13:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ee6754095
								
							
						 | 
						
							
							
								
								Mix Tasks: Add pleroma.benchmarks.tags
							
							
							
							
							
						 | 
						
							2020-01-14 17:24:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d0b989521
								
							
						 | 
						
							
							
								
								add subject to atom feed
							
							
							
							
							
						 | 
						
							2019-11-10 11:10:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82
								
							
						 | 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship
							
							
							
							
							
						 | 
						
							2019-10-11 02:35:32 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64095961fe
								
							
						 | 
						
							
							
								
								[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 | 
						
							2019-10-02 20:42:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3572cf29b7
								
							
						 | 
						
							
							
								
								Extract timeline actions from MastodonAPIController into TimelineController
							
							
							
							
							
						 | 
						
							2019-09-26 10:53:42 +07:00 | 
						
						
							
							
							
								
							
							
						 |