Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-30 12:15:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								dfd2c74184 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-03-29 06:57:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d75d0ed7a 
								
							 
						 
						
							
							
								
								Merge branch 'admin-api-change-password' into 'develop'  
							
							... 
							
							
							
							Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149  
							
						 
						
							2020-03-24 17:34:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6ee6784bc 
								
							 
						 
						
							
							
								
								creating trusted app from adminFE & mix task  
							
							
							
						 
						
							2020-03-23 10:44:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-20 20:47:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98a60df41f 
								
							 
						 
						
							
							
								
								include_types parameter in /api/v1/notifications  
							
							
							
						 
						
							2020-03-20 13:18:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f9ecb513fa 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-18 14:08:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								69341cbcba 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1530-removing-with_move' into 'develop'  
							
							... 
							
							
							
							Feature/1530 removing with move
Closes  #1530 
See merge request pleroma/pleroma!2306  
							
						 
						
							2020-03-18 10:12:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								13cce9c0de 
								
							 
						 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.  
							
							
							
						 
						
							2020-03-16 20:42:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d198e7fa2a 
								
							 
						 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password  
							
							
							
						 
						
							2020-03-16 20:32:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3791add99 
								
							 
						 
						
							
							
								
								removing with_move parameter  
							
							
							
						 
						
							2020-03-16 20:07:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8dd01b24d2 
								
							 
						 
						
							
							
								
								Improve documentation of mrf_object_age  
							
							
							
						 
						
							2020-03-16 11:44:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0651730bd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-16 14:25:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa4ec17c84 
								
							 
						 
						
							
							
								
								Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'  
							
							... 
							
							
							
							[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes  #1560 
See merge request pleroma/pleroma!2235  
							
						 
						
							2020-03-15 19:15:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e87a32bcd7 
								
							 
						 
						
							
							
								
								rip out fetch_initial_posts  
							
							... 
							
							
							
							Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes  #1595  #1422  
							
						 
						
							2020-03-15 15:59:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ecb7809e92 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/plugs/static_fe_plug.ex 
							
						 
						
							2020-03-14 15:37:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4db88242e5 
								
							 
						 
						
							
							
								
								Merge branch 'docs/direct_conversation_id' into 'develop'  
							
							... 
							
							
							
							pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263  
							
						 
						
							2020-03-13 18:58:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39ed608b13 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-12 18:31:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bd40880fa0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions  
							
							... 
							
							
							
							# Conflicts:
#	test/web/activity_pub/activity_pub_controller_test.exs 
							
						 
						
							2020-03-12 12:07:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								00d1752031 
								
							 
						 
						
							
							
								
								Merge branch 'docs/new_user' into 'develop'  
							
							... 
							
							
							
							CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes  #1621 
See merge request pleroma/pleroma!2286  
							
						 
						
							2020-03-11 20:26:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6316726a5f 
								
							 
						 
						
							
							
								
								CLI_tasks: Use manpage formatting conventions  
							
							... 
							
							
							
							- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip] 
							
						 
						
							2020-03-11 08:48:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a06104b9d5 
								
							 
						 
						
							
							
								
								CLI_tasks/user.md: Fix pleroma.user new documentation  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621 
[ci skip] 
							
						 
						
							2020-03-11 08:36:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								972889550d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions  
							
							
							
						 
						
							2020-03-11 09:15:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9134d4430 
								
							 
						 
						
							
							
								
								installation/otp_en.md: Fix pleroma.nginx target [deb]  
							
							... 
							
							
							
							Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29  
							
						 
						
							2020-03-10 11:49:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								841e4e4d83 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' into 'develop'  
							
							... 
							
							
							
							Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233  
							
						 
						
							2020-03-09 13:36:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								edb659dc57 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-03-08 14:10:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b2eb1124d1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-07 12:41:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								027714b519 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions  
							
							
							
						 
						
							2020-03-06 11:48:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								9b740cfb23 
								
							 
						 
						
							
							
								
								Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'  
							
							... 
							
							
							
							Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes  #1596 
See merge request pleroma/pleroma!2267  
							
						 
						
							2020-03-04 18:22:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b34bc669b9 
								
							 
						 
						
							
							
								
								adding descriptions  
							
							
							
						 
						
							2020-03-04 20:09:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d9dee1ba9 
								
							 
						 
						
							
							
								
								retry_timeout description change  
							
							
							
						 
						
							2020-03-04 08:56:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8854770fc4 
								
							 
						 
						
							
							
								
								retry and retry_timeout settings default change  
							
							
							
						 
						
							2020-03-03 18:01:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28ed4b41d0 
								
							 
						 
						
							
							
								
								naming for checkin from pool timeout  
							
							
							
						 
						
							2020-03-03 13:05:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								df3c59d928 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-03-03 09:45:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								509c81e4b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-03 10:08:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b6c7843d6 
								
							 
						 
						
							
							
								
								debian_based_*.md: Use erlang-nox metapackage  
							
							
							
						 
						
							2020-03-03 05:00:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f987d83885 
								
							 
						 
						
							
							
								
								Clarify in docs how to control connections_pool for Gun.  
							
							... 
							
							
							
							It could easily be confused with the Hackney settings. 
							
						 
						
							2020-03-02 13:00:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b4367125e9 
								
							 
						 
						
							
							
								
								[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.  
							
							
							
						 
						
							2020-03-02 21:43:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4c02e04935 
								
							 
						 
						
							
							
								
								Merge branch 'prepared-statements-settings' into 'develop'  
							
							... 
							
							
							
							Prepared statements settings
See merge request pleroma/pleroma!2238  
							
						 
						
							2020-03-02 17:00:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7af431c150 
								
							 
						 
						
							
							
								
								Exclude reblogs from GET /api/pleroma/admin/statuses by default  
							
							
							
						 
						
							2020-03-02 16:47:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								036e8a40a2 
								
							 
						 
						
							
							
								
								fix for :fetch_initial_posts  
							
							... 
							
							
							
							A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now 
							
						 
						
							2020-03-02 10:29:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								deb5f5c40e 
								
							 
						 
						
							
							
								
								pleroma_api.md: direct_conversation_id vs. conversation_id  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1594  
							
						 
						
							2020-03-02 04:01:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								53ef8c11b9 
								
							 
						 
						
							
							
								
								Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)  
							
							... 
							
							
							
							I also made a more explicit distinction between OTP and from source installs in the general explanation 
							
						 
						
							2020-03-01 19:16:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9e4b77f8b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-01 12:48:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ffcebe7e22 
								
							 
						 
						
							
							
								
								timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user  
							
							
							
						 
						
							2020-03-01 01:13:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								19e559fe51 
								
							 
						 
						
							
							
								
								Merge branch 'rate-limiter-runtime-settings' into 'develop'  
							
							... 
							
							
							
							RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250  
							
						 
						
							2020-02-29 21:52:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								814b275af7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-29 11:34:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f2efb1c45 
								
							 
						 
						
							
							
								
								Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.  
							
							
							
						 
						
							2020-02-27 18:46:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								4ab07cf0d5 
								
							 
						 
						
							
							
								
								Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses  
							
							
							
						 
						
							2020-02-26 22:35:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b012ddd69 
								
							 
						 
						
							
							
								
								some docs  
							
							
							
						 
						
							2020-02-25 19:01:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e4804137b3 
								
							 
						 
						
							
							
								
								Document database default changes  
							
							
							
						 
						
							2020-02-25 11:53:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f452ad1f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-25 07:22:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7ad5c51f23 
								
							 
						 
						
							
							
								
								Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope  
							
							
							
						 
						
							2020-02-24 21:46:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								c0146f4859 
								
							 
						 
						
							
							
								
								DOCS Theming your instance  
							
							... 
							
							
							
							I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance 
							
						 
						
							2020-02-24 17:48:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c05cbc47f9 
								
							 
						 
						
							
							
								
								Better advice for vacuuming after restoring.  
							
							
							
						 
						
							2020-02-22 13:14:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f0ca19b9c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	config/config.exs 
							
						 
						
							2020-02-22 09:31:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Igeljäger 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed485ec1d 
								
							 
						 
						
							
							
								
								added why doing a vacuum after restoring a backup is so important  
							
							
							
						 
						
							2020-02-21 15:30:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								13918cb545 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-21 10:02:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c5570e0493 
								
							 
						 
						
							
							
								
								Merge branch 'single_emoji_reaction' into 'develop'  
							
							... 
							
							
							
							Single emoji reaction
Closes  #1578 
See merge request pleroma/pleroma!2226  
							
						 
						
							2020-02-20 23:50:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3eddd9caa6 
								
							 
						 
						
							
							
								
								Merge branch 'require-signature' into 'develop'  
							
							... 
							
							
							
							Add an option to require fetches to be signed
Closes  #1444 
See merge request pleroma/pleroma!2071  
							
						 
						
							2020-02-20 12:13:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d536a00d42 
								
							 
						 
						
							
							
								
								Merge branch 'docs_updating' into 'develop'  
							
							... 
							
							
							
							DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108  
							
						 
						
							2020-02-20 12:03:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0c65a8c3d0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2020-02-20 15:00:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b2de6385 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-registrations-digest' into 'develop'  
							
							... 
							
							
							
							New users digest email
Closes  #1514 
See merge request pleroma/pleroma!2128  
							
						 
						
							2020-02-20 11:58:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3af6d3f8e2 
								
							 
						 
						
							
							
								
								Emoji Reactions: Add documentation  
							
							
							
						 
						
							2020-02-19 17:17:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								53a7680c16 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/mrf-sample-doc'  
							
							... 
							
							
							
							# Conflicts:
#   docs/configuration/mrf.md 
							
						 
						
							2020-02-18 20:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								3416948cdf 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-docs' into 'develop'  
							
							... 
							
							
							
							Fix MRF documentation
See merge request pleroma/pleroma!2187  
							
						 
						
							2020-02-18 20:57:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cf94349287 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-02-18 09:06:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								61d9f43e46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							
							
						 
						
							2020-02-18 17:46:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c07efd5b42 
								
							 
						 
						
							
							
								
								Merge branch 'need-reboot-flag' into 'develop'  
							
							... 
							
							
							
							need_reboot flag for adminFE
See merge request pleroma/pleroma!2188  
							
						 
						
							2020-02-18 14:32:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								514c899275 
								
							 
						 
						
							
							
								
								adding gun adapter  
							
							
							
						 
						
							2020-02-18 08:19:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								269d592181 
								
							 
						 
						
							
							
								
								[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).  
							
							
							
						 
						
							2020-02-15 20:41:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								589bffa57d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc  
							
							
							
						 
						
							2020-02-14 11:06:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31749559e1 
								
							 
						 
						
							
							
								
								Fix MRF docs further. I don't think anyone has actually tested with the old docs.  
							
							
							
						 
						
							2020-02-14 11:04:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6caf6a86c5 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/mrf.md  
							
							
							
						 
						
							2020-02-14 16:55:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								88a76d0142 
								
							 
						 
						
							
							
								
								Update suggested path for location of your custom MRF  
							
							
							
						 
						
							2020-02-14 10:55:18 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2c95b0fab9 
								
							 
						 
						
							
							
								
								Make the sample code actually compile  
							
							
							
						 
						
							2020-02-13 15:19:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								da44ee5b0f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-13 09:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								24c526a0b1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge  
							
							
							
						 
						
							2020-02-11 13:58:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2f1c61255f 
								
							 
						 
						
							
							
								
								Merge branch 'doc/unlisted-search' into 'develop'  
							
							... 
							
							
							
							differences_in_mastoapi_responses.md: Add note about unlisted results
Closes  #1164 
See merge request pleroma/pleroma!2195  
							
						 
						
							2020-02-11 11:44:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6875ccb6bf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-registrations-digest  
							
							
							
						 
						
							2020-02-11 13:54:55 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ebffd5224 
								
							 
						 
						
							
							
								
								Merge branch 'docs/kyclos' into 'develop'  
							
							... 
							
							
							
							clients.md: Add Kyclos
See merge request pleroma/pleroma!2196  
							
						 
						
							2020-02-11 08:04:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								58574ef156 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-11 08:35:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								209e4d8432 
								
							 
						 
						
							
							
								
								clients.md: Add Kyclos  
							
							
							
						 
						
							2020-02-11 02:27:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad16f38b9c 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: Add note about unlisted results  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164  
							
						 
						
							2020-02-11 01:59:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								94e5ca1105 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1383' into 'develop'  
							
							... 
							
							
							
							[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015  
							
						 
						
							2020-02-11 00:04:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e946b99a 
								
							 
						 
						
							
							
								
								DOCS Backup/Restore/Migrate your instance  
							
							... 
							
							
							
							* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
   * I added a new step to drop and recreate an empty pleroma-database
   * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
   * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15 
							
						 
						
							2020-02-10 23:53:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6813c0302c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-10 20:49:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b87533760b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-02-10 07:59:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dad23e3766 
								
							 
						 
						
							
							
								
								need_reboot flag  
							
							
							
						 
						
							2020-02-08 13:00:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								815f659ed8 
								
							 
						 
						
							
							
								
								Fix MRF documentation  
							
							
							
						 
						
							2020-02-07 22:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								57098713c0 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/API/pleroma_api.md  
							
							
							
						 
						
							2020-02-07 15:18:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713645d5c5 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/API/pleroma_api.md  
							
							
							
						 
						
							2020-02-07 15:17:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								ce95882009 
								
							 
						 
						
							
							
								
								EmojiReactions: Add docs and Changelog  
							
							
							
						 
						
							2020-02-07 14:59:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f13b7878b4 
								
							 
						 
						
							
							
								
								Merge branch 'rename_emoji_reactios' into 'develop'  
							
							... 
							
							
							
							EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181  
							
						 
						
							2020-02-07 10:35:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01da001da1 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2020-02-07 10:48:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e12bf05f23 
								
							 
						 
						
							
							
								
								Merge branch 'fix/dymamic-docs' into 'develop'  
							
							... 
							
							
							
							Simplify in-database config docs
See merge request pleroma/pleroma!2178  
							
						 
						
							2020-02-06 16:03:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6769ecd948 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/dymamic-docs  
							
							
							
						 
						
							2020-02-06 15:04:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6722dade42 
								
							 
						 
						
							
							
								
								Simplify in-database config docs  
							
							... 
							
							
							
							Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore) 
							
						 
						
							2020-02-06 15:00:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c85aa6e87f 
								
							 
						 
						
							
							
								
								removing confusing error  
							
							
							
						 
						
							2020-02-06 12:50:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5db6ac8ee4 
								
							 
						 
						
							
							
								
								removing migrate_from_db endpoint from admin api  
							
							
							
						 
						
							2020-02-05 20:36:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								49e80a1537 
								
							 
						 
						
							
							
								
								Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'  
							
							... 
							
							
							
							Restarting pleroma from outside application
See merge request pleroma/pleroma!2144  
							
						 
						
							2020-02-05 16:59:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								90b862e7ab 
								
							 
						 
						
							
							
								
								Add cheatsheet entry  
							
							
							
						 
						
							2020-02-04 16:22:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c40c8b4a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-03 21:42:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								774cba84f5 
								
							 
						 
						
							
							
								
								Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'  
							
							... 
							
							
							
							Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164  
							
						 
						
							2020-01-30 18:47:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								01537cc1d6 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-30 18:28:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ff4bef140a 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-30 13:24:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								889965141a 
								
							 
						 
						
							
							
								
								RemoteIp: only trust X-Forwarded-For  
							
							... 
							
							
							
							Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway. 
							
						 
						
							2020-01-30 00:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f5cb2af85a 
								
							 
						 
						
							
							
								
								cheatsheet: improve rate limiter docs and add new limiters  
							
							
							
						 
						
							2020-01-30 00:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d378550d2d 
								
							 
						 
						
							
							
								
								Emoji Reactions: Document changes  
							
							
							
						 
						
							2020-01-29 11:40:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5e8a6444 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-01-28 21:11:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								21a2a05407 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-28 20:39:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								12b6fcdb8c 
								
							 
						 
						
							
							
								
								Merge branch 'features/task-test-email' into 'develop'  
							
							... 
							
							
							
							Create pleroma.email mix task
Closes  #1061 
See merge request pleroma/pleroma!2118  
							
						 
						
							2020-01-28 16:42:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4eb935be78 
								
							 
						 
						
							
							
								
								Create pleroma.email mix task  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061  
							
						 
						
							2020-01-28 16:49:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								c8964cc438 
								
							 
						 
						
							
							
								
								DOCS General update for the "Introduction to Pleroma" section  
							
							... 
							
							
							
							* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the 😄  thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more) 
							
						 
						
							2020-01-28 12:57:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c6e5c541d 
								
							 
						 
						
							
							
								
								docs update  
							
							
							
						 
						
							2020-01-27 19:48:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								dabd535e43 
								
							 
						 
						
							
							
								
								Remove user recommendation by third party engine  
							
							
							
						 
						
							2020-01-27 13:21:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e442ea5722 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-01-27 15:20:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								bfc70fdf29 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-27 08:48:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a994878f1 
								
							 
						 
						
							
							
								
								Emoji reactions: Update docs and changelog  
							
							
							
						 
						
							2020-01-24 10:53:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5fc2fa8908 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-23 11:11:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								dddebee047 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-notifications' into 'develop'  
							
							... 
							
							
							
							Emoji notifications
See merge request pleroma/pleroma!2130  
							
						 
						
							2020-01-23 02:12:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Farhan Khan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89eeadc2a8 
								
							 
						 
						
							
							
								
								Updated OpenBSD installation guide for version OpenBSD 6.6  
							
							... 
							
							
							
							* initdb command now requires explicit -U and -D flags
* acme-client now requires version v02 API endpoint
* Added step to add admin user, per other installation guides
* Corrected setup_db.psql path 
							
						 
						
							2020-01-22 17:33:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c59e9477a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest  
							
							
							
						 
						
							2020-01-22 15:59:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								85f45c7689 
								
							 
						 
						
							
							
								
								Document new EmojiReaction notifications  
							
							
							
						 
						
							2020-01-22 20:11:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8b90d967a 
								
							 
						 
						
							
							
								
								Update documentation  
							
							
							
						 
						
							2020-01-22 22:28:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf19bf3c7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-22 20:20:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								be27777156 
								
							 
						 
						
							
							
								
								Merge branch 'admin-be' into 'develop'  
							
							... 
							
							
							
							Config api for admin-fe
Closes  #1406 
See merge request pleroma/pleroma!1976  
							
						 
						
							2020-01-22 17:13:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								e761d76e4f 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-22 16:58:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								d43c9ab286 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-22 16:58:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3e074e949 
								
							 
						 
						
							
							
								
								little fixes  
							
							
							
						 
						
							2020-01-22 18:22:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a9c6f119ac 
								
							 
						 
						
							
							
								
								docs update  
							
							
							
						 
						
							2020-01-22 18:08:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								043cd5aa54 
								
							 
						 
						
							
							
								
								Emoji reactions: Document changes  
							
							
							
						 
						
							2020-01-22 13:58:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								32a643a159 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-22 11:22:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b8d5c09f48 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-22 09:30:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f01ab6cd29 
								
							 
						 
						
							
							
								
								some refactor and tests  
							
							
							
						 
						
							2020-01-21 18:42:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5b5f14dc 
								
							 
						 
						
							
							
								
								StatusView: Add emoji_reactions  
							
							
							
						 
						
							2020-01-20 16:24:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								e02eb8de3e 
								
							 
						 
						
							
							
								
								Add OTP to updating.md  
							
							... 
							
							
							
							* I removed the Update section from the OTP install and added it to updating.md
* I also added a link to the updating.md from the OTP install page
* I added a Questions section to the OTP install, similar to the debian_based_en.md
* Restructured the updating.md a bit
I would very much also like to link to the changelog, but I don't know how to do it because I can't find the page in the docs? 
							
						 
						
							2020-01-15 09:12:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								70c7a26de8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into admin-be  
							
							
							
						 
						
							2020-01-14 14:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b7908844f2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-13 12:41:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								e1308f10bd 
								
							 
						 
						
							
							
								
								docs: API: update Mastodon API link  
							
							
							
						 
						
							2020-01-11 05:06:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d933fd3d61 
								
							 
						 
						
							
							
								
								more renamings  
							
							
							
						 
						
							2020-01-10 19:51:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								958d0452e4 
								
							 
						 
						
							
							
								
								fix for pleroma assets group update  
							
							
							
						 
						
							2020-01-10 18:18:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00aff5f78c 
								
							 
						 
						
							
							
								
								syncing new setting to descriptions.exs  
							
							
							
						 
						
							2020-01-10 17:54:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb9a43c3ae 
								
							 
						 
						
							
							
								
								typo fix  
							
							
							
						 
						
							2020-01-10 15:52:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fea734ca70 
								
							 
						 
						
							
							
								
								errors on endpoints  
							
							
							
						 
						
							2020-01-10 15:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5cacb988b9 
								
							 
						 
						
							
							
								
								partially settings update  
							
							
							
						 
						
							2020-01-10 15:52:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77 
								
							 
						 
						
							
							
								
								config editing through database  
							
							
							
						 
						
							2020-01-10 15:51:59 +03:00