| 
								
								
									 lain | f012c3a202 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-15 13:33:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1d18721a3c | Chats: Add updated_at to Schema and docs. | 2020-05-15 13:18:41 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e090191d03 | [OpenAPI] Mark all not required request fields as nullable | 2020-05-15 14:55:41 +04:00 |  | 
				
					
						| 
								
								
									 rinpatch | e455ca3f3e | Merge branch 'feature/database-configuration-whitelist' into 'develop' Database configuration whitelist
See merge request pleroma/pleroma!2522 | 2020-05-14 16:07:37 +00:00 |  | 
				
					
						| 
								
								
									 lain | 4157c459b8 | Merge branch 'bcrypt-auth' into 'develop' Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527 | 2020-05-14 14:36:56 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 5b0f27d23d | Pbkdf2.verify_pass --> AuthenticationPlug.checkpw | 2020-05-14 08:57:38 -05:00 |  | 
				
					
						| 
								
								
									 Stephanie Wilde-Hobbs | 20cbfb5cb5 | Allow whitelisting whole groups | 2020-05-14 12:43:53 +01:00 |  | 
				
					
						| 
								
								
									 lain | 3342846ac2 | ChatView: Add update_at field. | 2020-05-14 13:20:28 +02:00 |  | 
				
					
						| 
								
								
									 Steph | 5c6f575315 | Style fixes | 2020-05-14 12:15:48 +01:00 |  | 
				
					
						| 
								
								
									 lain | 39ec1af993 | Merge branch 'openapi/pleroma-api/accounts' into 'develop' Add OpenAPI spec for PleromaAPI.AccountController
See merge request pleroma/pleroma!2528 | 2020-05-14 09:25:18 +00:00 |  | 
				
					
						| 
								
								
									 lain | 359d7b0a6d | Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex | 2020-05-14 09:09:11 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1c2629328d | Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex | 2020-05-14 09:07:09 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 249e009c5e | Add pleroma_internalas an internal field | 2020-05-13 16:14:24 -05:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 9cbf17d59f | Handle bcrypt passwords for Mastodon migration | 2020-05-13 10:53:56 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6802dc28ba | Add OpenAPI spec for PleromaAPI.AccountController | 2020-05-13 19:06:46 +04:00 |  | 
				
					
						| 
								
								
									 lain | 0f0acc740d | Chat: Allow posting without content if an attachment is present. | 2020-05-13 15:31:28 +02:00 |  | 
				
					
						| 
								
								
									 lain | 06cad239e5 | InstanceView: Add pleroma chat messages to nodeinfo | 2020-05-13 14:05:22 +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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | bcadbf964a | Add OpenAPI spec for SuggestionController | 2020-05-13 14:15:24 +04:00 |  | 
				
					
						| 
								
								
									 lain | 156c8a5088 | Merge branch 'openapi/statuses' into 'develop' Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521 | 2020-05-13 09:34:30 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1307d6ca3c | Merge branch 'openapi/timelines' into 'develop' Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506 | 2020-05-13 09:33:37 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | b46811a074 | Upgrade Comeonin to v5 https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md | 2020-05-12 17:14:59 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 79ad12064d | Fix format | 2020-05-13 01:59:17 +04:00 |  | 
				
					
						| 
								
								
									 minibikini | cb1a3e196c | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:43 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 5a2333925c | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:36 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 822e9c09aa | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:23:21 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 40646a7e0e | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:14:52 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 0bb164a3e1 | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:12:22 +00:00 |  | 
				
					
						| 
								
								
									 minibikini | 648cc0d72d | Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex | 2020-05-12 21:09:26 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 7803a85d2c | Add OpenAPI spec for StatusController | 2020-05-13 00:25:21 +04:00 |  | 
				
					
						| 
								
								
									 Stephanie Wilde-Hobbs | a2fcfc78c9 | Filter config descriptions by config whitelist | 2020-05-12 21:07:33 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 2b18b8a263 | Merge branch 'streamer-get-topic' into 'develop' Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519 | 2020-05-12 17:02:57 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 24c8c13640 | Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop' ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514 | 2020-05-12 16:45:46 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4cc71aad65 | Merge branch '1748-remote-following-follower-count' into 'develop' Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515 | 2020-05-12 16:44:58 +00:00 |  | 
				
					
						| 
								
								
									 Stephanie Wilde-Hobbs | 620247a015 | Add database configuration whitelist | 2020-05-12 17:12:27 +01:00 |  | 
				
					
						| 
								
								
									 href | e6d8cacf2d | Expand and authorize streams in Streamer directly | 2020-05-12 18:04:47 +02:00 |  | 
				
					
						| 
								
								
									 lain | c0ea5c60e4 | ChatController: Don't return chats for user you've blocked. | 2020-05-12 16:43:04 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8308611279 | Startup: suggest updating OTP when the version is too low for gun I've seen quite a few people wonder what to do when presented with
this error message. | 2020-05-12 17:30:39 +03:00 |  | 
				
					
						| 
								
								
									 lain | ec72cba43e | Chat Controller: Add basic error handling. | 2020-05-12 13:23:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | dcb5cda324 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-12 13:13:43 +02:00 |  | 
				
					
						| 
								
								
									 lain | b5aa204eb8 | ChatController: Support deletion of chat messages. | 2020-05-12 13:13:03 +02:00 |  | 
				
					
						| 
								
								
									 lain | ca31af473c | Transmogrifier: On incoming follow accept, update follow counts. | 2020-05-12 12:29:37 +02:00 |  | 
				
					
						| 
								
								
									 lain | d0ba1844b0 | ActivityPub: Fix non-federating blocks. | 2020-05-12 10:52:46 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | f8190aea5e | Merge branch 'fix/issue-1676' into 'develop' [#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492 | 2020-05-11 22:30:36 +00:00 |  | 
				
					
						| 
								
								
									 lain | f28ed36b4d | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-11 17:14:58 +02:00 |  | 
				
					
						| 
								
								
									 href | e2b15e8ad3 | Fix streamer timeout (closes #1753). Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client. | 2020-05-11 16:51:34 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5367a00257 | Deletion: Handle the case of pruned objects. | 2020-05-11 15:06:23 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 3bde0fa3f6 | Add OpenAPI spec for TimelineController | 2020-05-11 15:43:03 +04:00 |  | 
				
					
						| 
								
								
									 lain | fdb98715b8 | Chat: Fix wrong query. | 2020-05-11 10:58:14 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8d5597ff68 | ChatController: Add GET /chats/:id | 2020-05-10 13:26:14 +02:00 |  |