| 
								
								
									 Egor Kislitsyn | 2f77842bd3 | Fix account registration when captcha is enabled but not provided | 2020-04-29 21:26:07 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 8148d76ec5 | Document captcha_answer_dataparameter | 2020-04-29 21:26:07 +04:00 |  | 
				
					
						| 
								
								
									 lain | 58fded9858 | Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop' Automatic checks of authentication / authorization / instance publicity
See merge request pleroma/pleroma!2409 | 2020-04-29 11:09:30 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 4c0e53367a | [#2349] Post-merge fix. | 2020-04-28 20:04:25 +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 | 699fc9569f | Merge branch 'docs/notification_destroy_multiple' into 'develop' Document DELETE /api/v1/notifications/destroy_multiple
Closes #1711
See merge request pleroma/pleroma!2435 | 2020-04-28 15:40:18 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4b3298133b | Document DELETE /api/v1/notifications/destroy_multiple | 2020-04-28 10:13:58 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | 12bb7fc0dc | Merge branch 'openapi/account' into 'develop' Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374 | 2020-04-28 11:57:16 +00:00 |  | 
				
					
						| 
								
								
									 lain | 9994768312 | Merge branch 'mongoose-secure' into 'develop' mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432 | 2020-04-28 09:18:59 +00:00 |  | 
				
					
						| 
								
								
									 fence | 5ff20793e7 | formating | 2020-04-28 01:29:31 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | dda65f7799 | Move single used schemas to operation schema | 2020-04-27 22:55:05 +04:00 |  | 
				
					
						| 
								
								
									 fence | d607b4d840 | mongooseim test: explicitly set password for the deactivated used | 2020-04-27 19:32:58 +02:00 |  | 
				
					
						| 
								
								
									 fence | 935ca2c132 | requested changes to mongoose test | 2020-04-27 19:16:05 +02:00 |  | 
				
					
						| 
								
								
									 fence | cc1e2e8d0f | requested changes to mongoose_im_controller.ex | 2020-04-27 19:11:03 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2efc00b3cf | Use json_response_and_validate_schema/2in tests to validate OpenAPI schema | 2020-04-27 20:46:52 +04:00 |  | 
				
					
						| 
								
								
									 fence | 5c7cc10917 | add tests for deactivated users for mongoose auth | 2020-04-27 18:31:00 +02:00 |  | 
				
					
						| 
								
								
									 fence | a626cb682c | secure mongoose auth endpoint | 2020-04-27 17:55:33 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f1ca917bb0 | Merge branch 'develop' into openapi/account | 2020-04-27 14:33:00 +04:00 |  | 
				
					
						| 
								
								
									 rinpatch | 01cc93b687 | Merge branch 'img-src-blob' into 'develop' Let blob: pass CSP
See merge request pleroma/pleroma!2427 | 2020-04-26 11:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 1bd9749a8f | Let blob: pass CSP | 2020-04-26 00:29:42 -05:00 |  | 
				
					
						| 
								
								
									 lain | dbc4791d9d | Merge branch '1706-dm-timeline-failure-fix' into 'develop' [#1706] Prevented error on unresolved activity actors for timeline actions
Closes #1706
See merge request pleroma/pleroma!2425 | 2020-04-25 19:24:22 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e16437ff19 | [#1706] Formatting fix. | 2020-04-25 18:42:08 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0d05e1fe39 | [#1706] Prevented error on unresolved activity actors for timeline actions. | 2020-04-25 18:24:10 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b4139cc547 | [#2409] Made GET /api/v1/accounts/:id/favouritesauth-optional, adjusted tests. | 2020-04-24 22:25:27 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8addbd948c | Merge branch 'bugfix/announce-race-condition' into 'develop' Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423 | 2020-04-24 16:58:24 +00:00 |  | 
				
					
						| 
								
								
									 lain | c30b3b2dc5 | Merge branch 'reply-filtering-refactor' into 'develop' Reply filtering refactor
See merge request pleroma/pleroma!2424 | 2020-04-24 16:32:13 +00:00 |  | 
				
					
						| 
								
								
									 lain | d89cd0a197 | Reply Filtering: Refactor. | 2020-04-24 18:25:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | d862c7156a | Merge branch 'openapi-improvements' into 'develop' Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421 | 2020-04-24 16:10:43 +00: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 |  | 
				
					
						| 
								
								
									 lain | e2f3030c86 | Apply suggestion to CHANGELOG.md | 2020-04-24 15:43:54 +03:00 |  | 
				
					
						| 
								
								
									 lain | 8480f84615 | Update differences_in_mastoapi_responses.md | 2020-04-24 15:43:54 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 375ab05234 | bench sync | 2020-04-24 15:43:54 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 1a75ef63b2 | updating benchmarks | 2020-04-24 15:43:54 +03:00 |  | 
				
					
						| 
								
								
									 Alexander | be34672d67 | formatting | 2020-04-24 15:43:54 +03:00 |  | 
				
					
						| 
								
								
									 Alexander | 6e625a427c | reply filtering | 2020-04-24 15:43:49 +03:00 |  | 
				
					
						| 
								
								
									 lain | cb12585098 | Announcements: Prevent race condition. | 2020-04-24 14:37:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | 2430b9bf90 | Merge branch 'feature/remove-unused-like-code' into 'develop' ActivitPub: Remove `like` function.
See merge request pleroma/pleroma!2422 | 2020-04-24 12:09:15 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1df6af2a4c | Credo fixes. | 2020-04-24 13:59:48 +02:00 |  | 
				
					
						| 
								
								
									 lain | bbf8554c97 | ActivitPub: Remove likefunction.We don't need another way to build likes. | 2020-04-24 13:48:13 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f362836742 | Support validation for inline OpenAPI schema and automatic tests for examples | 2020-04-24 15:16:15 +04:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 89f38d94c7 | [#2409] Fixed before-action callback results persistence. | 2020-04-23 21:47:33 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1b5f8d19ee | Merge branch 'bugfix/repeating-announce' into 'develop' CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418 | 2020-04-23 12:40:38 +00:00 |  | 
				
					
						| 
								
								
									 lain | 7d38197894 | CommonAPI: Don't make repeating announces possible | 2020-04-23 13:33:30 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 25eec6d72d | Merge branch 'bugfix/null-scheduled-at' into 'develop' StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412 | 2020-04-23 11:22:30 +00:00 |  | 
				
					
						| 
								
								
									 lain | 850377a7b8 | Merge branch 'bugfix/1629-fav-race-condition' into 'develop' SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417 | 2020-04-22 19:26:32 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1bcbdc7a9f | SideEffects: Use less cryptic syntax. | 2020-04-22 21:21:21 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | af27e4dffd | Merge branch 'bugfix/1670-user-count' into 'develop' Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414 | 2020-04-22 17:37:09 +00:00 |  | 
				
					
						| 
								
								
									 lain | f5bda09de6 | Stats: Use invisibleproperty for filtering. | 2020-04-22 19:02:22 +02:00 |  | 
				
					
						| 
								
								
									 lain | e62173dfc8 | SideEffects: Run in transaction. This fixes race conditions. | 2020-04-22 18:40:53 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1b06a27746 | Update Flake ID description | 2020-04-22 20:20:19 +04:00 |  |