Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5237a2df9f 
								
							 
						 
						
							
							
								
								[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.  
							
							
							
						 
						
							2020-06-19 16:14:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								063e6b9841 
								
							 
						 
						
							
							
								
								StatusController: Correctly paginate favorites.  
							
							... 
							
							
							
							Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this. 
							
						 
						
							2020-06-09 10:53:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								23e248694d 
								
							 
						 
						
							
							
								
								Announcements: Fix all tests.  
							
							
							
						 
						
							2020-05-21 13:16:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45c3a72404 
								
							 
						 
						
							
							
								
								[OpenAPI] Use BooleanLike in all request bodies  
							
							
							
						 
						
							2020-05-18 20:58:59 +04: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								c10485db16 
								
							 
						 
						
							
							
								
								StatusController: Ignore nil scheduled_at parameters.  
							
							
							
						 
						
							2020-04-22 14:26:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							
							
						 
						
							2020-04-13 09:16:51 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c05f539aa 
								
							 
						 
						
							
							
								
								Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).  
							
							
							
						 
						
							2020-03-20 18:33:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e27c274f4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements  
							
							... 
							
							
							
							# Conflicts:
#	test/web/mastodon_api/controllers/account_controller_test.exs 
							
						 
						
							2020-03-20 18:08:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3c2c32b460 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel' into develop  
							
							
							
						 
						
							2020-03-19 18:00:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ec3719f539 
								
							 
						 
						
							
							
								
								Improved in-test config management functions.  
							
							
							
						 
						
							2020-03-18 20:30:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4bce13fa2f 
								
							 
						 
						
							
							
								
								MastodonController: Return 404 errors correctly.  
							
							
							
						 
						
							2020-03-04 18:09:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf4ecffcea 
								
							 
						 
						
							
							
								
								Merge branch 'tests-clear-config-tweaks' into 'develop'  
							
							... 
							
							
							
							Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209  
							
						 
						
							2020-02-20 11:36:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca7ac068f0 
								
							 
						 
						
							
							
								
								Add a test  
							
							
							
						 
						
							2020-02-18 17:09:50 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f8c3462a8 
								
							 
						 
						
							
							
								
								Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.  
							
							
							
						 
						
							2020-02-13 21:55:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19516af74e 
								
							 
						 
						
							
							
								
								Fix status.expires_in validation  
							
							
							
						 
						
							2020-02-12 20:20:44 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								d85bcc8627 
								
							 
						 
						
							
							
								
								Questions: Add timezone to closed property  
							
							
							
						 
						
							2020-02-07 16:57:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2199d63ddc 
								
							 
						 
						
							
							
								
								StatusControllerTest: Fix typo  
							
							
							
						 
						
							2020-01-20 15:31:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								510776ba31 
								
							 
						 
						
							
							
								
								CommonAPI: Don't error out on double favs/repeats  
							
							
							
						 
						
							2020-01-20 14:27:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7973cbdb9f 
								
							 
						 
						
							
							
								
								OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.  
							
							
							
						 
						
							2019-12-15 22:32:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5cc30165 
								
							 
						 
						
							
							
								
								[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.  
							
							
							
						 
						
							2019-11-19 23:22:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3db988250b 
								
							 
						 
						
							
							
								
								[ #1335 ] User: refactored :blocks field into :blocked_users relation.  
							
							... 
							
							
							
							Introduced UserBlock. 
							
						 
						
							2019-11-10 16:30:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1bd1f62af5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel  
							
							
							
						 
						
							2019-11-05 15:21:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a11a7176d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2019-10-21 11:05:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								05c58eaece 
								
							 
						 
						
							
							
								
								change Maksim's test description  
							
							
							
						 
						
							2019-10-19 23:23:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								189a288925 
								
							 
						 
						
							
							
								
								fix test  
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9694d51437 
								
							 
						 
						
							
							
								
								added test fo Pleroma.Web.MastodonAPI.StatusController  
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1381d68e7 
								
							 
						 
						
							
							
								
								StatusControllerTest: Capture log.  
							
							
							
						 
						
							2019-10-19 14:46:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e4f52f8a2 
								
							 
						 
						
							
							
								
								Introduce new ingestion pipeline structure, implement internal Likes with it.  
							
							
							
						 
						
							2019-10-16 16:16:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								580a67f5ca 
								
							 
						 
						
							
							
								
								Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)  
							
							
							
						 
						
							2019-10-09 07:27:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0c68eeb02 
								
							 
						 
						
							
							
								
								Move :favourites and :bookmarks actions to StatusController  
							
							
							
						 
						
							2019-10-02 21:31:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								427d0c2a00 
								
							 
						 
						
							
							
								
								Store private announcements in object.data["announcements"], filter them on display  
							
							
							
						 
						
							2019-10-01 22:39:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7d5a9f3f6d 
								
							 
						 
						
							
							
								
								Add tests for privately announcing statuses via API  
							
							
							
						 
						
							2019-10-01 20:38:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9202904da9 
								
							 
						 
						
							
							
								
								status_controller.ex: Posting media status without content defined  
							
							
							
						 
						
							2019-09-28 01:53:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								374f83d29b 
								
							 
						 
						
							
							
								
								Fix not being able to post empty statuses with attachments  
							
							... 
							
							
							
							Attachment field was filled in after the empty status check 
							
						 
						
							2019-09-28 01:58:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0a5b106ddd 
								
							 
						 
						
							
							
								
								Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController  
							
							
							
						 
						
							2019-09-27 13:36:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5ea5c58a85 
								
							 
						 
						
							
							
								
								Move view logic from StatusController.context to StatusView and add a test  
							
							
							
						 
						
							2019-09-27 10:52:47 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								76b7e5cd5b 
								
							 
						 
						
							
							
								
								Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest  
							
							
							
						 
						
							2019-09-27 10:52:47 +07:00