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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a7f31bf06c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-09-13 16:31:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f649a2e972 
								
							 
						 
						
							
							
								
								Pleroma API Docs: Documented Emoji reaction endpoints.  
							
							
							
						 
						
							2019-09-13 16:19:50 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									AkiraFukushima 
								
							 
						 
						
							
							
							
							
								
							
							
								7808eee9aa 
								
							 
						 
						
							
							
								
								Update Japanese document to follow English document  
							
							
							
						 
						
							2019-08-31 16:23:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ultem 
								
							 
						 
						
							
							
							
							
								
							
							
								880307e0d5 
								
							 
						 
						
							
							
								
								minor: Fix version dot  
							
							
							
						 
						
							2019-08-30 19:41:31 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ultem 
								
							 
						 
						
							
							
							
							
								
							
							
								ef9930ed80 
								
							 
						 
						
							
							
								
								Minor corrections and clarification for Alpine standard v.3.10  
							
							
							
						 
						
							2019-08-24 10:16:27 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a2e1db5632 
								
							 
						 
						
							
							
								
								Increase max account fields limits  
							
							
							
						 
						
							2019-08-14 14:58:38 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e457fcc479 
								
							 
						 
						
							
							
								
								Add :max_remote_account_fields config option  
							
							
							
						 
						
							2019-08-14 14:58:06 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								2c35d4b0b0 
								
							 
						 
						
							
							
								
								Add configurable account field name length limit  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								db3c05f6b4 
								
							 
						 
						
							
							
								
								Add configurable account field value length limit  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0ac5c7a66 
								
							 
						 
						
							
							
								
								Add custom profile fields  
							
							
							
						 
						
							2019-08-14 14:52:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef31767f2 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-vocabulary' into 'develop'  
							
							... 
							
							
							
							MRF Vocabulary
See merge request pleroma/pleroma!1559  
							
						 
						
							2019-08-13 22:51:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5983f98f26 
								
							 
						 
						
							
							
								
								docs tweak  
							
							
							
						 
						
							2019-08-13 22:40:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								83a3de8cc4 
								
							 
						 
						
							
							
								
								Merge branch 'length-limit-bio' into 'develop'  
							
							... 
							
							
							
							Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515  
							
						 
						
							2019-08-13 22:40:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3cfaac39e2 
								
							 
						 
						
							
							
								
								docs: document mrf_vocabulary module settings  
							
							
							
						 
						
							2019-08-13 20:55:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								f46cd7e9c7 
								
							 
						 
						
							
							
								
								config: remove legacy activitypub accept_blocks setting  
							
							... 
							
							
							
							Anyone who is interested in dropping blocks can write their own MRF
policy at this point.  This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy. 
							
						 
						
							2019-08-13 02:15:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								60231ec7bd 
								
							 
						 
						
							
							
								
								Conversation: Add endpoint to get a conversation by id.  
							
							
							
						 
						
							2019-08-12 13:58:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								11d08c2de0 
								
							 
						 
						
							
							
								
								tests for Pleroma.Uploaders  
							
							
							
						 
						
							2019-08-10 18:46:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29807ef6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/digest-email' into 'develop'  
							
							... 
							
							
							
							Feature/digest email
See merge request pleroma/pleroma!1078  
							
						 
						
							2019-08-08 14:38:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a2b98f6d58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations  
							
							
							
						 
						
							2019-08-08 16:04:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a49c92f6ae 
								
							 
						 
						
							
							
								
								Participation: Setting recipients will always add the owner.  
							
							
							
						 
						
							2019-08-06 14:51:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ddabe7784b 
								
							 
						 
						
							
							
								
								Pleroma Conversations: Document differences.  
							
							
							
						 
						
							2019-08-05 15:58:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									x0rz3q 
								
							 
						 
						
							
							
							
							
								
							
							
								3411f506b3 
								
							 
						 
						
							
							
								
								Replace "impode" with "implode" for  
							
							
							
						 
						
							2019-08-04 14:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pierce McGoran 
								
							 
						 
						
							
							
							
							
								
							
							
								9b9453ceaf 
								
							 
						 
						
							
							
								
								Fix some typos and rework a few lines in howto_mediaproxy.md  
							
							
							
						 
						
							2019-08-04 03:12:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								de0f3b73dd 
								
							 
						 
						
							
							
								
								Admin fixes  
							
							
							
						 
						
							2019-08-03 18:16:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca4506355 
								
							 
						 
						
							
							
								
								Add configurable length limits for User.bio and User.name  
							
							
							
						 
						
							2019-08-01 15:53:37 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								51b3b6d816 
								
							 
						 
						
							
							
								
								Admin changes  
							
							
							
						 
						
							2019-07-30 16:36:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								242f5c585e 
								
							 
						 
						
							
							
								
								add account confirmation email resend in mastodon api  
							
							
							
						 
						
							2019-07-28 20:30:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								2c83eb0b15 
								
							 
						 
						
							
							
								
								Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"  
							
							... 
							
							
							
							This reverts commit 2981821db8 
							
						 
						
							2019-07-24 17:09:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								2981821db8 
								
							 
						 
						
							
							
								
								squash! Expose expires_at datetime in mastoAPI only for the activity actor  
							
							... 
							
							
							
							NOTE: rewrite the commit msg 
							
						 
						
							2019-07-24 16:51:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2da3d30f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-24 16:37:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								3cb471ec06 
								
							 
						 
						
							
							
								
								Expose expires_at datetime in mastoAPI only for the activity actor  
							
							... 
							
							
							
							In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so. 
							
						 
						
							2019-07-24 14:47:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								704960b3c1 
								
							 
						 
						
							
							
								
								Add support for activity expiration to common and Masto API  
							
							... 
							
							
							
							The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not. 
							
						 
						
							2019-07-24 14:45:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								378f5f0fbe 
								
							 
						 
						
							
							
								
								Add activity expiration worker  
							
							... 
							
							
							
							This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker. 
							
						 
						
							2019-07-24 13:14:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0be548b90a 
								
							 
						 
						
							
							
								
								Merge branch 'Fix-static-dir-doc' into 'develop'  
							
							... 
							
							
							
							Fix static_dir docs
See merge request pleroma/pleroma!1465  
							
						 
						
							2019-07-24 01:59:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aries 
								
							 
						 
						
							
							
							
							
								
							
							
								9638da43e9 
								
							 
						 
						
							
							
								
								Add text about gitignore  
							
							
							
						 
						
							2019-07-24 01:50:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								f46805bb40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-24 02:42:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								03471151d6 
								
							 
						 
						
							
							
								
								AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)  
							
							
							
						 
						
							2019-07-24 01:51:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								5e72554f3c 
								
							 
						 
						
							
							
								
								Admin config fix  
							
							
							
						 
						
							2019-07-23 19:17:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aries 
								
							 
						 
						
							
							
							
							
								
							
							
								1e7d68e8bf 
								
							 
						 
						
							
							
								
								Fix the sentence and add the setting example  
							
							
							
						 
						
							2019-07-23 09:55:58 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aries 
								
							 
						 
						
							
							
							
							
								
							
							
								63924ee712 
								
							 
						 
						
							
							
								
								Fix static_dir docs  
							
							
							
						 
						
							2019-07-22 18:46:32 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8292331b35 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-20 16:41:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								93df0796f0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/matstodon-statuses-by-name' into 'develop'  
							
							... 
							
							
							
							Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211  
							
						 
						
							2019-07-19 21:59:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9169f331b6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/matstodon-statuses-by-name  
							
							
							
						 
						
							2019-07-19 16:55:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								33729bbb28 
								
							 
						 
						
							
							
								
								Merge branch 'feature/richmedia-ttl' into 'develop'  
							
							... 
							
							
							
							add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438  
							
						 
						
							2019-07-19 21:36:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tom79 
								
							 
						 
						
							
							
							
							
								
							
							
								5c4a555b1d 
								
							 
						 
						
							
							
								
								Fix domain for the contact clients.md  
							
							
							
						 
						
							2019-07-19 08:40:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tom79 
								
							 
						 
						
							
							
							
							
								
							
							
								b0b9eca37d 
								
							 
						 
						
							
							
								
								Update clients.md for Fedilab  
							
							... 
							
							
							
							- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features 
							
						 
						
							2019-07-19 08:39:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								581756ccc5 
								
							 
						 
						
							
							
								
								update the docs  
							
							
							
						 
						
							2019-07-19 11:50:47 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								de9906ad56 
								
							 
						 
						
							
							
								
								change the structure of image ttl parsar  
							
							
							
						 
						
							2019-07-19 11:43:42 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								9570a5be40 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-18 23:38:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a0014681 
								
							 
						 
						
							
							
								
								Merge branch 'feature/signed-object-fetches' into 'develop'  
							
							... 
							
							
							
							signed object fetches
See merge request pleroma/pleroma!1446  
							
						 
						
							2019-07-18 13:27:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									aries 
								
							 
						 
						
							
							
							
							
								
							
							
								129078eddc 
								
							 
						 
						
							
							
								
								Fix redirect setting not working  
							
							
							
						 
						
							2019-07-18 21:08:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tallship 
								
							 
						 
						
							
							
							
							
								
							
							
								cffe8229a5 
								
							 
						 
						
							
							
								
								Update clients.md - added Homepage for Fedilab Android app  
							
							
							
						 
						
							2019-07-17 23:03:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bradley D. Thornton 
								
							 
						 
						
							
							
							
							
								
							
							
								cdecef2a08 
								
							 
						 
						
							
							
								
								Update otp_en.md - Added creation of initial admin user  
							
							
							
						 
						
							2019-07-17 22:35:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b2a8ccf37f 
								
							 
						 
						
							
							
								
								config: add sign_object_fetches option  
							
							
							
						 
						
							2019-07-17 21:38:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ce73d5f6a5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mention-mrf' into 'develop'  
							
							... 
							
							
							
							Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439  
							
						 
						
							2019-07-17 15:28:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									RX14 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96a2890a9e 
								
							 
						 
						
							
							
								
								Add MRF MentionPolicy for dropping posts which mention specific actors  
							
							
							
						 
						
							2019-07-17 15:16:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								18234cc44e 
								
							 
						 
						
							
							
								
								add the rich media ttl based on image exp time  
							
							
							
						 
						
							2019-07-17 00:20:34 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2ba07b63f4 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/config.md  
							
							
							
						 
						
							2019-07-16 16:59:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								889dc17abd 
								
							 
						 
						
							
							
								
								[ #1094 ] Rate-limited follow & unfollow actions.  
							
							
							
						 
						
							2019-07-16 19:18:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bca70b10a 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-16 16:19:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								520ee6c591 
								
							 
						 
						
							
							
								
								Add pleroma.deactivated to the Account entity (Mastodon API)  
							
							
							
						 
						
							2019-07-16 11:14:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ffb4eb9779 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/matstodon-statuses-by-name  
							
							
							
						 
						
							2019-07-15 17:10:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								345a38778e 
								
							 
						 
						
							
							
								
								Remove dead link from the installation docs  
							
							
							
						 
						
							2019-07-15 21:43:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								7af27c143d 
								
							 
						 
						
							
							
								
								changelog & docs  
							
							
							
						 
						
							2019-07-14 09:23:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								418ae6638d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/admin-api-user-statuses  
							
							
							
						 
						
							2019-07-14 00:39:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								a9459ff98f 
								
							 
						 
						
							
							
								
								Admin API: Endpoint for fetching latest user's statuses  
							
							
							
						 
						
							2019-07-14 00:37:26 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							
							
						 
						
							2019-07-12 18:08:27 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							
							
						 
						
							2019-07-09 21:21:09 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2cb18b2a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							
							
						 
						
							2019-06-30 21:23:35 +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-daemon with daemon-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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2019-06-29 00:52:50 +03: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