kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1e48af9acf 
								
							 
						 
						
							
							
								
								Merge branch 'feature/instance-fetch-actor' into 'develop'  
							
							 
							
							... 
							
							
							
							instance fetch service actor
See merge request pleroma/pleroma!1440  
							
						 
						
							2019-07-17 19:45:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4bf2bb9cff 
								
							 
						 
						
							
							
								
								Fix password reset for non-test env  
							
							 
							
							... 
							
							
							
							Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled. 
							
						 
						
							2019-07-17 18:09:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								cf9cb953d5 
								
							 
						 
						
							
							
								
								activitypub: represent internal fetch actor  
							
							 
							
							
							
						 
						
							2019-07-17 17:34:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d930e5d5c3 
								
							 
						 
						
							
							
								
								activitypub: introduce internal fetch service actor  
							
							 
							
							
							
						 
						
							2019-07-17 17:14:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								0a6f6e1b5b 
								
							 
						 
						
							
							
								
								webfinger: allow resolution of usernames with dots in them (internal actors)  
							
							 
							
							
							
						 
						
							2019-07-17 16:59:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a9d6a12bb3 
								
							 
						 
						
							
							
								
								activitypub: controller: rework the way the relay actor is presented so the code can be reused  
							
							 
							
							
							
						 
						
							2019-07-17 16:33:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4885473be2 
								
							 
						 
						
							
							
								
								user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()  
							
							 
							
							
							
						 
						
							2019-07-17 16:03:05 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								10f82c88b8 
								
							 
						 
						
							
							
								
								mastoapi password reset  
							
							 
							
							... 
							
							
							
							added rate limit to password reset
configure rate limit in runtime 
							
						 
						
							2019-07-16 21:44:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								889dc17abd 
								
							 
						 
						
							
							
								
								[ #1094 ] Rate-limited follow & unfollow actions.  
							
							 
							
							
							
						 
						
							2019-07-16 19:18:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								520ee6c591 
								
							 
						 
						
							
							
								
								Add pleroma.deactivated to the Account entity (Mastodon API)  
							
							 
							
							
							
						 
						
							2019-07-16 11:14:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								c4ca142e14 
								
							 
						 
						
							
							
								
								Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-16 11:04:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								70439494af 
								
							 
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2019-07-16 14:56:07 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								996fd58ac4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/poll-id-as-string' into 'develop'  
							
							 
							
							... 
							
							
							
							Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430  
							
						 
						
							2019-07-16 06:06:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed24bcc76 
								
							 
						 
						
							
							
								
								Status View: Poll ids are strings.  
							
							 
							
							... 
							
							
							
							All ids in mastodon are strings, in general. 
							
						 
						
							2019-07-16 12:47:40 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								9f987dd017 
								
							 
						 
						
							
							
								
								Merge branch 'match-file-name' into 'develop'  
							
							 
							
							... 
							
							
							
							try to always match the filename for proxy url
See merge request pleroma/pleroma!1405  
							
						 
						
							2019-07-15 22:04:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							 
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ee5250ae56 
								
							 
						 
						
							
							
								
								Merge branch 'sha512-crypt' into 'develop'  
							
							 
							
							... 
							
							
							
							detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422  
							
						 
						
							2019-07-15 16:13:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1d906ffa82 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into match-file-name  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex 
							
						 
						
							2019-07-15 21:30:56 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c32384c1ea 
								
							 
						 
						
							
							
								
								tests for Pleroma.Signature  
							
							 
							
							
							
						 
						
							2019-07-15 13:01:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							 
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d86a97abfb 
								
							 
						 
						
							
							
								
								Add an explanation comment to Publisher.publish/2  
							
							 
							
							
							
						 
						
							2019-07-15 14:20:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							 
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							 
							
							
							
						 
						
							2019-07-15 14:00:29 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fa17879c20 
								
							 
						 
						
							
							
								
								added tests for Web.MediaProxy  
							
							 
							
							
							
						 
						
							2019-07-14 21:01:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							 
							
							
							
						 
						
							2019-07-14 19:25:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								739bbe0d3b 
								
							 
						 
						
							
							
								
								security: detect object containment violations at the IR level  
							
							 
							
							... 
							
							
							
							It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph. 
							
						 
						
							2019-07-14 17:47:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Moonman 
								
							 
						 
						
							
							
							
							
								
							
							
								f98f7ad1b9 
								
							 
						 
						
							
							
								
								detect and use sha512-crypt for stored password hash.  
							
							 
							
							
							
						 
						
							2019-07-14 09:48:42 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f4447d82b8 
								
							 
						 
						
							
							
								
								parsers configurable  
							
							 
							
							
							
						 
						
							2019-07-14 09:21:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								80c46d6d8b 
								
							 
						 
						
							
							
								
								nodeinfo: implement MRF transparency exclusions  
							
							 
							
							
							
						 
						
							2019-07-13 18:53:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d72876c57d 
								
							 
						 
						
							
							
								
								[ #1041 ] Minor refactoring.  
							
							 
							
							
							
						 
						
							2019-07-13 15:21:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								369e9bb42f 
								
							 
						 
						
							
							
								
								[ #1041 ] Rate-limited status actions (per user and per user+status).  
							
							 
							
							
							
						 
						
							2019-07-13 14:49:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								095117a58c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/ap-hide-follows  
							
							 
							
							
							
						 
						
							2019-07-12 21:43:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								97b79efbcd 
								
							 
						 
						
							
							
								
								ActivityPub Controller: Actually pass for_user to following/followers  
							
							 
							
							... 
							
							
							
							views and give 403 errors when trying to request hidden follower pages
when unauthenticated 
							
						 
						
							2019-07-12 20:54:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e3ae6154 
								
							 
						 
						
							
							
								
								try to always match the filename for proxy url  
							
							 
							
							
							
						 
						
							2019-07-12 22:56:14 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								92055941bd 
								
							 
						 
						
							
							
								
								Pleroma.Web.Metadata - tests  
							
							 
							
							
							
						 
						
							2019-07-12 16:42:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6ac7680d 
								
							 
						 
						
							
							
								
								ActivityPub User view: Following/Followers refactoring  
							
							 
							
							... 
							
							
							
							- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it 
							
						 
						
							2019-07-12 19:41:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								360e4cdaa2 
								
							 
						 
						
							
							
								
								Move these to pleroma namespace in Mastodon API  
							
							 
							
							
							
						 
						
							2019-07-12 11:25:58 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6c4d134b 
								
							 
						 
						
							
							
								
								preserve the original path/filename (no encoding/decoding) for proxy  
							
							 
							
							
							
						 
						
							2019-07-12 21:05:01 +05:45  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							 
							
							
							
						 
						
							2019-07-11 13:55:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								846ad9a463 
								
							 
						 
						
							
							
								
								admin api configure changes  
							
							 
							
							
							
						 
						
							2019-07-11 13:02:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4e3fd7e55 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1019-refactor' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix/1019 refactor
See merge request pleroma/pleroma!1397  
							
						 
						
							2019-07-11 13:01:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9e06873d58 
								
							 
						 
						
							
							
								
								Add list to Visibility  
							
							 
							
							
							
						 
						
							2019-07-11 19:29:24 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								958fb9aa80 
								
							 
						 
						
							
							
								
								Add "listMessage"  
							
							 
							
							
							
						 
						
							2019-07-11 16:36:08 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							 
							
							
							
						 
						
							2019-07-11 13:26:59 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								252e129b1e 
								
							 
						 
						
							
							
								
								MastoAPI: Add categories to custom emojis  
							
							 
							
							... 
							
							
							
							Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch. 
							
						 
						
							2019-07-10 17:02:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f8786fa6f2 
								
							 
						 
						
							
							
								
								adding following_address field to user  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00