| 
								
								
									 Egor Kislitsyn | 0c66bb5857 | Update documentation | 2019-07-15 14:27:56 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 64a946643e | Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists | 2019-07-15 14:11:54 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 7af27c143d | changelog & docs | 2019-07-14 09:23:43 +03:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 0cc638b968 | docs: note that exclusions usage will be included in the transparency metrics if used | 2019-07-13 19:00:03 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 80c46d6d8b | nodeinfo: implement MRF transparency exclusions | 2019-07-13 18:53:14 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b74d11e20a | [#1041] Added documentation on existing rate limiters. | 2019-07-13 15:13:26 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 360e4cdaa2 | Move these to pleroma namespace in Mastodon API | 2019-07-12 11:25:58 -05:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 846ad9a463 | admin api configure changes | 2019-07-11 13:02:13 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 182f7bbb11 | Merge branch 'develop' into feature/addressable-lists | 2019-07-11 13:26:59 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | beba7bbc85 | removing synchronization worker | 2019-07-10 17:42:18 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 12b1454245 | [#1062] added option to disable send email | 2019-07-10 05:34:21 +00:00 |  | 
				
					
						| 
								
								
									 feld | c91b5c87ff | Docs/more mastodon api | 2019-07-09 18:20:36 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 9a9b60cfbc | Merge branch 'develop' into feature/allow-user-query-via-id | 2019-07-09 12:49:04 -05:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | d6b0fce6e9 | Fix/1019 correct count remote users | 2019-07-09 17:36:35 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | dd5a41e2a4 | Apply suggestion to docs/config.md | 2019-07-09 10:39:36 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 9f23502856 | Fix docs | 2019-07-06 15:16:56 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ad8d86e7c6 | Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit | 2019-07-06 10:17:06 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 6c50fbcd14 | Admin API: Allow querying user by ID | 2019-07-05 19:33:53 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 3b05f834f4 | Merge branch 'fix/docs-dry-run' into 'develop' OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366 | 2019-07-01 04:52:42 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 611f6665ac | Update changelog and admin API docs with tags, display_name, avatar additions | 2019-07-01 03:36:42 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a799418573 | [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit # Conflicts:
#	CHANGELOG.md | 2019-06-30 16:05:00 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 2b9d914089 | [#161] Refactoring, documentation. | 2019-06-30 15:58:50 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 044eb039c2 | OTP Release install docs: Remove --dry-run in cron certbot command | 2019-06-30 13:06:10 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | acd20f166b | [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text | 2019-06-30 07:28:35 +00:00 |  | 
				
					
						| 
								
								
									 deorsum | 4c40ada7a5 | Add a caveat for docker deployment in the config docs | 2019-06-29 21:14:11 +10:00 |  | 
				
					
						| 
								
								
									 rinpatch | eddcebf8ae | Add a warning about service files assuming installation paths | 2019-06-29 11:35:42 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b6cfc8f98b | Merge branch 'patch-3' into 'develop' Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352 | 2019-06-29 06:01:33 +00:00 |  | 
				
					
						| 
								
								
									 Yuji Nakao | ab6de9b478 | Move all upload contents despite upload folder itself. | 2019-06-29 04:24:44 +00:00 |  | 
				
					
						| 
								
								
									 Yuji Nakao | b2548e65db | Update migrating_from_source_otp_en.md: Replace reload-daemonwithdaemon-reload. | 2019-06-29 04:17:49 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 074ffee0b2 | docs: add documentation for MediaProxyWarmingPolicy | 2019-06-28 23:20:17 +00:00 |  | 
				
					
						| 
								
								
									 Julien Wehmschulte | e556c96661 | Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files | 2019-06-28 18:25:21 +00:00 |  | 
				
					
						| 
								
								
									 lain | 2286f62a36 | Merge branch 'release-docs' into 'develop' Docs on OTP releases
See merge request pleroma/pleroma!1315 | 2019-06-28 15:26:09 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | eeb419e3a0 | Add a note about the develop branch | 2019-06-28 09:42:45 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4f44732100 | Add a note on what OTP releases are | 2019-06-27 09:45:13 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c6705144a2 | don't delete config settings on admin update | 2019-06-27 04:19:44 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | f5f1bb35c3 | Instructions on getting the flavour | 2019-06-26 15:24:06 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 877f91c0c4 | Do not assume ~pleroma == /opt/pleroma | 2019-06-26 15:20:22 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | e404335af8 | Add all the remaining sections to Switching to OTP releases | 2019-06-26 11:34:58 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 9f8e645dce | Merge branch 'feature/configurable-pack-extensions' into 'develop' Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338 | 2019-06-26 05:34:02 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 41e4752950 | Make default pack extensions configurable and default to png and gif | 2019-06-26 06:48:59 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | ec01b7c934 | Apply suggestion to docs/config.md | 2019-06-26 03:23:26 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 4ad15ad2a9 | add ignore hosts and TLDs for rich_media | 2019-06-25 22:25:37 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 44aa895b78 | Add a note that OTP releases don't contain revision history | 2019-06-25 05:50:25 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 57d18b06ab | Remove the useless specification of test size and make the main points bold | 2019-06-25 04:55:41 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 687f0aee51 | Basic skeleton of "Switching a from-source install to OTP releases" | 2019-06-24 11:51:02 +03:00 |  | 
				
					
						| 
								
								
									 aries | 550302c041 | Apply suggestion to docs/config.md | 2019-06-24 01:09:28 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7fc226e0fe | Remove the warning about alpine as the issue is now solved | 2019-06-24 02:50:28 +03:00 |  | 
				
					
						| 
								
								
									 aries | 7daaaf84f1 | Fix markdown mistakes | 2019-06-24 01:28:01 +09:00 |  | 
				
					
						| 
								
								
									 aries | 4bac13966b | modify config.md for S3 | 2019-06-24 01:10:55 +09:00 |  | 
				
					
						| 
								
								
									 kaniini | 8b7860f12f | Merge branch 'admin-config' into 'develop' Admin config
See merge request pleroma/pleroma!1328 | 2019-06-23 05:42:37 +00:00 |  |