rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								518b0193a1
								
							
						 | 
						
							
							
								
								Big config cheatsheet revamp
							
							
							
							
							
							
							
							Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc. 
							
						 | 
						
							2019-11-10 03:33:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								7888803ffe
								
							
						 | 
						
							
							
								
								Mastodon API: Add the recipients parameter to GET /api/v1/conversations
							
							
							
							
							
						 | 
						
							2019-11-07 08:26:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab5c8ec9fa
								
							
						 | 
						
							
							
								
								Update docs
							
							
							
							
							
						 | 
						
							2019-11-01 20:27:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee04fbc35a
								
							
						 | 
						
							
							
								
								[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 | 
						
							2019-10-20 22:29:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6fdfbc4f1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 | 
						
							2019-10-20 20:43:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8843974cb
								
							
						 | 
						
							
							
								
								[#1304] Moved remaining fields from User.Info to User.
							
							
							
							
							
							
							
							Misc. fixes / improvements. 
							
						 | 
						
							2019-10-20 13:42:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								f01dbc450c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mastofe-pwa' into 'develop'
							
							
							
							
							
							
							
							MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834 
							
						 | 
						
							2019-10-19 20:11:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								52ed2f8f2d
								
							
						 | 
						
							
							
								
								Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
							
							
							
							
							
						 | 
						
							2019-10-19 15:24:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									KokaKiwi
								
							 
						 | 
						
							
							
							
							
								
							
							
								df3c2dfd8b
								
							
						 | 
						
							
							
								
								Add documentation for PWA manifest configuration.
							
							
							
							
							
						 | 
						
							2019-10-19 12:15:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2473702be2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/relay-list
							
							
							
							
							
						 | 
						
							2019-10-18 10:24:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								da0e4879bc
								
							
						 | 
						
							
							
								
								DELETE /api/pleroma/admin/users now accepts nicknames array
							
							
							
							
							
						 | 
						
							2019-10-15 17:33:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b1bc079af
								
							
						 | 
						
							
							
								
								Merge branch 'exclude-visibilities-for-timelines' into 'develop'
							
							
							
							
							
							
							
							Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818 
							
						 | 
						
							2019-10-14 19:40:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e9243e8a2
								
							
						 | 
						
							
							
								
								Preparations for renaming master to stable
							
							
							
							
							
						 | 
						
							2019-10-14 18:38:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								a97b642289
								
							
						 | 
						
							
							
								
								Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
							
							
							
							
							
						 | 
						
							2019-10-14 02:57:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc6875b582
								
							
						 | 
						
							
							
								
								Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
							
							
							
							
							
						 | 
						
							2019-10-11 19:12:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aaa4252f41
								
							
						 | 
						
							
							
								
								Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
							
							
							
							
							
						 | 
						
							2019-10-11 15:58:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5104f36bb
								
							
						 | 
						
							
							
								
								Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
							
							
							
							
							
						 | 
						
							2019-10-11 00:24:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad42837244
								
							
						 | 
						
							
							
								
								Ability to toggle activation status and permission group for a group of users
							
							
							
							
							
						 | 
						
							2019-10-09 17:03:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b3f77a99f
								
							
						 | 
						
							
							
								
								Extract RSS Feed functionality from OStatus
							
							
							
							
							
						 | 
						
							2019-10-07 12:20:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								8249924485
								
							
						 | 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity
							
							
							
							
							
						 | 
						
							2019-10-05 20:12:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								e07e9cb75e
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !1737 
							
						 | 
						
							2019-10-05 10:00:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c04e81724
								
							
						 | 
						
							
							
								
								Merge branch 'user-info-unread-direct-conversation' into 'develop'
							
							
							
							
							
							
							
							Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737 
							
						 | 
						
							2019-10-04 17:33:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								27110793a7
								
							
						 | 
						
							
							
								
								Merge branch 'featrue/job-monitor' into 'develop'
							
							
							
							
							
							
							
							Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721 
							
						 | 
						
							2019-10-04 12:52:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e4ab9a05dd
								
							
						 | 
						
							
							
								
								cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
							
							
							
							
							
						 | 
						
							2019-10-04 00:10:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								06d9df79c5
								
							
						 | 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity
							
							
							
							
							
						 | 
						
							2019-10-04 00:53:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								69784eb75a
								
							
						 | 
						
							
							
								
								Add a missing language specification
							
							
							
							
							
						 | 
						
							2019-10-03 15:10:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1cae564b5d
								
							
						 | 
						
							
							
								
								Move config task docs to a separate file and mark it as WIP
							
							
							
							
							
						 | 
						
							2019-10-03 14:12:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6baa037903
								
							
						 | 
						
							
							
								
								Move database maintenance tasks docs to a separate file
							
							
							
							
							
						 | 
						
							2019-10-03 11:17:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e08d5b233
								
							
						 | 
						
							
							
								
								MkDocs does not like if a paragraph doesn't have a newline after it
							
							
							
							
							
						 | 
						
							2019-10-03 11:02:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2656f41818
								
							
						 | 
						
							
							
								
								Remove silent mode note as it's no longer relevant
							
							
							
							
							
						 | 
						
							2019-10-03 10:57:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								aefb4dcff5
								
							
						 | 
						
							
							
								
								Cheatsheet: Use note/warning blocks instead of bold text
							
							
							
							
							
						 | 
						
							2019-10-03 10:54:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e560d65db3
								
							
						 | 
						
							
							
								
								Fix a typo in activity expirations
							
							
							
							
							
						 | 
						
							2019-10-03 10:45:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								25849157aa
								
							
						 | 
						
							
							
								
								Remove fe settings from :instance as they no longer do anything
							
							
							
							
							
						 | 
						
							2019-10-03 10:43:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e70009490
								
							
						 | 
						
							
							
								
								Move bold text in RemoveIp description into a proper warning
							
							
							
							
							
						 | 
						
							2019-10-03 10:39:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb162678df
								
							
						 | 
						
							
							
								
								Add missing language spec
							
							
							
							
							
						 | 
						
							2019-10-03 10:37:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								66450f8615
								
							
						 | 
						
							
							
								
								Cheatsheet: Move the deprecated config warning into a warning block
							
							
							
							
							
						 | 
						
							2019-10-03 10:36:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cbe2dcbde
								
							
						 | 
						
							
							
								
								Oops
							
							
							
							
							
						 | 
						
							2019-10-03 10:31:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4ca864c6b
								
							
						 | 
						
							
							
								
								Move user tasks docs to a separate file
							
							
							
							
							
						 | 
						
							2019-10-03 10:15:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fd47a4a5a
								
							
						 | 
						
							
							
								
								Use consistent command signature
							
							
							
							
							
						 | 
						
							2019-10-03 09:38:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5372bfb4a
								
							
						 | 
						
							
							
								
								Fix up some headings
							
							
							
							
							
						 | 
						
							2019-10-03 09:36:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d39ccc2e7f
								
							
						 | 
						
							
							
								
								Move uploads task docs to a separate file
							
							
							
							
							
						 | 
						
							2019-10-03 09:35:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								808d0a0170
								
							
						 | 
						
							
							
								
								Move relay docs to a separate file
							
							
							
							
							
						 | 
						
							2019-10-03 09:10:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								6435ba83cd
								
							
						 | 
						
							
							
								
								Move instance CLI task docs to a text file
							
							
							
							
							
						 | 
						
							2019-10-03 09:06:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a54739a530
								
							
						 | 
						
							
							
								
								Improve styling of CLI tasks
							
							
							
							
							
						 | 
						
							2019-10-03 08:51:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								869ea2ab90
								
							
						 | 
						
							
							
								
								Move digest email docs to a separate file and improve styling
							
							
							
							
							
						 | 
						
							2019-10-03 01:10:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd9c7807fb
								
							
						 | 
						
							
							
								
								Move emoji task docs to a separate file
							
							
							
							
							
						 | 
						
							2019-10-03 01:03:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2767c413fb
								
							
						 | 
						
							
							
								
								Remove a reference to inline docs since everything it describes is
							
							
							
							
							
							
							
							described in the cheatsheet already and add A TODO 
							
						 | 
						
							2019-10-03 00:36:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ba5c1a9d7
								
							
						 | 
						
							
							
								
								Fix more links
							
							
							
							
							
						 | 
						
							2019-10-03 00:22:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8e5e46fa8
								
							
						 | 
						
							
							
								
								Fix references to other pages
							
							
							
							
							
						 | 
						
							2019-10-03 00:18:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								74d682a09e
								
							
						 | 
						
							
							
								
								Remove Small customizations as it's contents have been integrated into
							
							
							
							
							
							
							
							static_dir.md 
							
						 | 
						
							2019-10-03 00:02:01 +03:00 | 
						
						
							
							
							
								
							
							
						 |