kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								29dd8ab9c0
								
							
						 | 
						
							
							
								
								Merge branch 'feature/force-password-reset' into 'develop'
							
							
							
							
							
							
							
							Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705 
							
						 | 
						
							2019-09-23 22:42:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19263f30c3
								
							
						 | 
						
							
							
								
								Merge branch 'support-rel-ugc' into 'develop'
							
							
							
							
							
							
							
							Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679 
							
						 | 
						
							2019-09-23 22:41:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rachel Fae Fox
								
							 
						 | 
						
							
							
							
							
								
							
							
								63af6951fa
								
							
						 | 
						
							
							
								
								add tunable for stream uploads, as needed for jortage to work.
							
							
							
							
							
						 | 
						
							2019-09-23 20:38:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd48bd80eb
								
							
						 | 
						
							
							
								
								Merge branch 'better-emoji-packs' into 'develop'
							
							
							
							
							
							
							
							Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551 
							
						 | 
						
							2019-09-23 18:20:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f25668215
								
							
						 | 
						
							
							
								
								Admin API: Add ability to force user's password reset
							
							
							
							
							
						 | 
						
							2019-09-22 16:08:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe4db3b94e
								
							
						 | 
						
							
							
								
								API Docs: Document conversation ids.
							
							
							
							
							
						 | 
						
							2019-09-19 21:01:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1e011624d
								
							
						 | 
						
							
							
								
								Merge branch 'docs/clients-update' into 'develop'
							
							
							
							
							
							
							
							docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697 
							
						 | 
						
							2019-09-19 18:01:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf3041220a
								
							
						 | 
						
							
							
								
								Add support for rel="ugc"
							
							
							
							
							
						 | 
						
							2019-09-19 14:56:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3856bed0c
								
							
						 | 
						
							
							
								
								docs/clients.md: Update source code urls
							
							
							
							
							
						 | 
						
							2019-09-18 23:17:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								86795d5ac2
								
							
						 | 
						
							
							
								
								Document emoji pack listing in the api docs
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								43022c347f
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/api/pleroma_api.md
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								8aed05ac15
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/api/pleroma_api.md
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								d51e5e447e
								
							
						 | 
						
							
							
								
								Move emoji reloading to admin api
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd818bdd48
								
							
						 | 
						
							
							
								
								Add documentation for the emoji endpoints
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee620ecbf1
								
							
						 | 
						
							
							
								
								Add caching for emoji pack sharing
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab2ca3038f
								
							
						 | 
						
							
							
								
								Merge branch 'hide-follower-following-count' into 'develop'
							
							
							
							
							
							
							
							Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663 
							
						 | 
						
							2019-09-18 21:13:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								a18f1e7cd7
								
							
						 | 
						
							
							
								
								namings
							
							
							
							
							
						 | 
						
							2019-09-18 10:49:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								17ff63b3c3
								
							
						 | 
						
							
							
								
								docs fix
							
							
							
							
							
						 | 
						
							2019-09-18 10:49:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								4faf2b1555
								
							
						 | 
						
							
							
								
								post for creating invite tokens in admin api
							
							
							
							
							
						 | 
						
							2019-09-18 10:49:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef2e2c5e12
								
							
						 | 
						
							
							
								
								Merge branch 'feature/return-total-for-reports' into 'develop'
							
							
							
							
							
							
							
							Admin API: Return total for reports
See merge request pleroma/pleroma!1628 
							
						 | 
						
							2019-09-17 19:09:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								450bf7a63c
								
							
						 | 
						
							
							
								
								Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
							
							
							
							
							
						 | 
						
							2019-09-17 14:45:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6ab78e610
								
							
						 | 
						
							
							
								
								Set account_field_value_length limit to 2048 by default
							
							
							
							
							
						 | 
						
							2019-09-16 21:48:01 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								219dca1b00
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/return-total-for-reports
							
							
							
							
							
						 | 
						
							2019-09-16 14:40:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b8ec98b0e
								
							
						 | 
						
							
							
								
								[#1149] Reinstated docs/config.md changes.
							
							
							
							
							
						 | 
						
							2019-09-15 10:15:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								c625fe6f09
								
							
						 | 
						
							
							
								
								config.md back
							
							
							
							
							
						 | 
						
							2019-09-13 19:03:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d9609894f
								
							
						 | 
						
							
							
								
								Merge branch 'feature/change-email' into 'develop'
							
							
							
							
							
							
							
							Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580 
							
						 | 
						
							2019-09-13 12:46:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f884987ace
								
							
						 | 
						
							
							
								
								Merge branch 'admin-config-description' into 'develop'
							
							
							
							
							
							
							
							Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611 
							
						 | 
						
							2019-09-13 12:36:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b5c81b391
								
							
						 | 
						
							
							
								
								Add a note about compatibility with Mastodon
							
							
							
							
							
						 | 
						
							2019-09-13 13:09:37 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								25d8216804
								
							
						 | 
						
							
							
								
								Add email change endpoint
							
							
							
							
							
						 | 
						
							2019-09-13 13:09:35 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Angelina Filippova
								
							 
						 | 
						
							
							
							
							
								
							
							
								528a88a686
								
							
						 | 
						
							
							
								
								Fix admin api docs for creating users
							
							
							
							
							
						 | 
						
							2019-09-13 03:31:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa7fb22008
								
							
						 | 
						
							
							
								
								placeholder for config.md
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab4960cc7f
								
							
						 | 
						
							
							
								
								deleting old config.md file
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								30f0cec49a
								
							
						 | 
						
							
							
								
								Add note about limit to the doc
							
							
							
							
							
						 | 
						
							2019-09-10 13:39:45 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b40b10b53d
								
							
						 | 
						
							
							
								
								Add an endpoint to get multiple statuses by IDs
							
							
							
							
							
						 | 
						
							2019-09-10 13:39:45 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								11e12b5761
								
							
						 | 
						
							
							
								
								Add Pleroma.Plugs.Cache
							
							
							
							
							
						 | 
						
							2019-09-09 18:53:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								af746fa4a8
								
							
						 | 
						
							
							
								
								Return total for reports
							
							
							
							
							
						 | 
						
							2019-09-04 20:08:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								3face45467
								
							
						 | 
						
							
							
								
								Mastodon API: Add pleroma.thread_muted to Status entity
							
							
							
							
							
							
							
							Needed for pleroma-fe!941 
							
						 | 
						
							2019-09-04 14:17:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								328b2612cd
								
							
						 | 
						
							
							
								
								Clarify that read notifications are returned
							
							
							
							
							
						 | 
						
							2019-09-04 13:39:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								377aa9fb90
								
							
						 | 
						
							
							
								
								Apply suggestion to docs/api/pleroma_api.md
							
							
							
							
							
						 | 
						
							2019-09-04 10:37:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2b6c1b089
								
							
						 | 
						
							
							
								
								Extend /api/pleroma/notifications/read to mark multiple notifications
							
							
							
							
							
							
							
							as read and make it respond with Mastoapi entities 
							
						 | 
						
							2019-09-04 12:38:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd076def0a
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2019-08-27 02:24:14 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								66c1966688
								
							
						 | 
						
							
							
								
								Disable rate limiter by default
							
							
							
							
							
						 | 
						
							2019-08-26 20:36:44 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								37dd3867bb
								
							
						 | 
						
							
							
								
								Log admin/moderator actions
							
							
							
							
							
						 | 
						
							2019-08-25 19:39:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								24994f3e0c
								
							
						 | 
						
							
							
								
								Activity expiration: Fix docs.
							
							
							
							
							
						 | 
						
							2019-08-24 17:28:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc6c0b4ba6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
							
							
							
							
							
						 | 
						
							2019-08-24 15:48:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									aries
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5f76a54e6
								
							
						 | 
						
							
							
								
								Fix default config of account fields length
							
							
							
							
							
						 | 
						
							2019-08-23 21:28:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8340fe8fcc
								
							
						 | 
						
							
							
								
								Merge branch 'digest-template' into 'develop'
							
							
							
							
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565 
							
						 | 
						
							2019-08-20 12:55:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef43016b2c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/custom-fields' into 'develop'
							
							
							
							
							
							
							
							Add custom profile fields
See merge request pleroma/pleroma!1488 
							
						 | 
						
							2019-08-20 12:44:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								158231cd20
								
							
						 | 
						
							
							
								
								Add configurable colors and logo for the digest template
							
							
							
							
							
						 | 
						
							2019-08-16 18:32:25 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								560dbad538
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations
							
							
							
							
							
						 | 
						
							2019-08-14 15:30:40 +02:00 | 
						
						
							
							
							
								
							
							
						 |