rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ba70a8cae6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/delivery-tracking  
							
							
							
						 
						
							2019-09-13 19:42:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac4a748fad 
								
							 
						 
						
							
							
								
								Disallow NULLs in deliveries  
							
							
							
						 
						
							2019-09-13 19:28:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								69faec031d 
								
							 
						 
						
							
							
								
								markdown generation to the new file  
							
							
							
						 
						
							2019-09-13 19:02:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8900cb68ae 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 15:25:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								05f8a066a1 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/delivery.ex  
							
							
							
						 
						
							2019-09-13 15:23:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2784962dba 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 15:23:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								53a3ad6043 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup-activity' into 'develop'  
							
							... 
							
							
							
							Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623  
							
						 
						
							2019-09-13 14:48:00 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3896a51b8a 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 10:09:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5170170483 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 10:09:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fb96facc32 
								
							 
						 
						
							
							
								
								Remove unused functions and fix credo issues  
							
							
							
						 
						
							2019-09-13 12:29:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce23529d91 
								
							 
						 
						
							
							
								
								Use delivery info when federating deletes  
							
							
							
						 
						
							2019-09-13 11:38:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								25d8216804 
								
							 
						 
						
							
							
								
								Add email change endpoint  
							
							
							
						 
						
							2019-09-13 13:09:35 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								39dc9b470c 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils  
							
							
							
						 
						
							2019-09-13 12:44:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								51609217c2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/error-log-double-quotes' into 'develop'  
							
							... 
							
							
							
							Fix double quotes in error logs
See merge request pleroma/pleroma!1656  
							
						 
						
							2019-09-12 20:21:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b0e6058021 
								
							 
						 
						
							
							
								
								Parse http signature for request to objects/activities  
							
							
							
						 
						
							2019-09-12 23:03:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dabc4a00f5 
								
							 
						 
						
							
							
								
								Put the cache with the right key when using a tracking function  
							
							
							
						 
						
							2019-09-12 22:10:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f548cb2b7 
								
							 
						 
						
							
							
								
								added test for Ostatus  
							
							
							
						 
						
							2019-09-12 10:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74e4c72c4a 
								
							 
						 
						
							
							
								
								Fix double quotes in error logs  
							
							... 
							
							
							
							Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil 
							
						 
						
							2019-09-11 16:16:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								56828abf6d 
								
							 
						 
						
							
							
								
								Use Jason for rendering responses  
							
							... 
							
							
							
							Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59) 
							
						 
						
							2019-09-11 23:06:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								46ae62d159 
								
							 
						 
						
							
							
								
								Merge branch 'patch-5' into 'develop'  
							
							... 
							
							
							
							Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642  
							
						 
						
							2019-09-11 17:47:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb7332aec7 
								
							 
						 
						
							
							
								
								Merge branch 'fix/oom-parallel-rendering' into 'develop'  
							
							... 
							
							
							
							Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654  
							
						 
						
							2019-09-11 11:21:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								be32d90a0c 
								
							 
						 
						
							
							
								
								little refactor  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								5ff12e7df1 
								
							 
						 
						
							
							
								
								some changes  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								35757b6d0e 
								
							 
						 
						
							
							
								
								don't add behaviour to suggestions  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								0624e06a9c 
								
							 
						 
						
							
							
								
								little fix  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								6721301086 
								
							 
						 
						
							
							
								
								some changes  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								a1f2dfb10a 
								
							 
						 
						
							
							
								
								expanding regex sigils to use modifiers  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								67e4300931 
								
							 
						 
						
							
							
								
								description formatters  
							
							
							
						 
						
							2019-09-11 09:25:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								43f02dfe38 
								
							 
						 
						
							
							
								
								Revert "Parallelize template rendering"  
							
							... 
							
							
							
							This reverts commit 1ad71592ad 
							
						 
						
							2019-09-10 22:01:45 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								edbaf78176 
								
							 
						 
						
							
							
								
								Merge branch 'fix/read-inbox' into 'develop'  
							
							... 
							
							
							
							Fix `ActivityPubController.read_inbox/2`
Closes  #1248 
See merge request pleroma/pleroma!1649  
							
						 
						
							2019-09-09 18:21:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f84d0043 
								
							 
						 
						
							
							
								
								Fix ActivityPubController.read_inbox/2  
							
							
							
						 
						
							2019-09-10 01:11:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c3f00447af 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-09-08 08:41:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								e5c6bf3673 
								
							 
						 
						
							
							
								
								Mastodon API: URI encode hashtag name in generated URLs  
							
							... 
							
							
							
							Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid. 
							
						 
						
							2019-09-07 19:50:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								39f99dc6cd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into support/tests  
							
							
							
						 
						
							2019-09-07 22:13:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								40a61532ca 
								
							 
						 
						
							
							
								
								activity: when restricting deactivated users, precalculate the user list  
							
							... 
							
							
							
							the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make.  while we plan to simplify these queries through
unification of activities and objects, we are not yet there.  it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead. 
							
						 
						
							2019-09-06 23:14:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5effb2cbca 
								
							 
						 
						
							
							
								
								activitypub: help ecto build a better query for thread mute filtering  
							
							... 
							
							
							
							using an indexed value in thread_mute table helps ecto build a better query. 
							
						 
						
							2019-09-06 23:11:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ca1ba1e272 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs 
							
						 
						
							2019-09-06 13:26:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								40b3289c26 
								
							 
						 
						
							
							
								
								Refactor add_link_headers/7 -> add_link_headers/3  
							
							
							
						 
						
							2019-09-06 17:08:47 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								896ffabe37 
								
							 
						 
						
							
							
								
								Merge branch 'so-long-twitterapi' into 'develop'  
							
							... 
							
							
							
							Removing TwitterAPI
See merge request pleroma/pleroma!1605  
							
						 
						
							2019-09-06 08:43:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3523bdcf26 
								
							 
						 
						
							
							
								
								Call TrailingFormatPlug for /api/pleroma/emoji  
							
							... 
							
							
							
							Apparently Pleroma-FE still calls it with trailing '.json' 
							
						 
						
							2019-09-05 22:21:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								736165c082 
								
							 
						 
						
							
							
								
								Reverse reports list  
							
							
							
						 
						
							2019-09-05 16:54:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								fe7cf44c40 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mastoapi-accounts-external' into 'develop'  
							
							... 
							
							
							
							Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622  
							
						 
						
							2019-09-05 12:48:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								26fe6f70c9 
								
							 
						 
						
							
							
								
								Move checking for restrict_local to User.get_cached_by_id_or_nickname  
							
							
							
						 
						
							2019-09-05 15:39:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b312ca3d52 
								
							 
						 
						
							
							
								
								Mastodon API Poll view: Fix handling of polls without an end date  
							
							
							
						 
						
							2019-09-05 12:03:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								79cf629e1a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-09-05 11:30:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3e30f6e198 
								
							 
						 
						
							
							
								
								Merge branch 'fix/safe-render-notifications' into 'develop'  
							
							... 
							
							
							
							Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630  
							
						 
						
							2019-09-05 05:47:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								558969a0fd 
								
							 
						 
						
							
							
								
								Do not crash if one notification failed to render  
							
							
							
						 
						
							2019-09-05 08:32:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ae506ca997 
								
							 
						 
						
							
							
								
								fix formatting  
							
							
							
						 
						
							2019-09-04 21:40:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								e2011a667c 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 18:35:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								8306078de1 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 17:31:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								af746fa4a8 
								
							 
						 
						
							
							
								
								Return total for reports  
							
							
							
						 
						
							2019-09-04 20:08:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								cb99cfcc65 
								
							 
						 
						
							
							
								
								don't try to truncate non-strings  
							
							
							
						 
						
							2019-09-04 15:57:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								2975da284b 
								
							 
						 
						
							
							
								
								truncate remote user bio/display name  
							
							
							
						 
						
							2019-09-04 15:45:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a890451187 
								
							 
						 
						
							
							
								
								fetch_announcements -> take_announcements  
							
							
							
						 
						
							2019-09-04 17:42:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8cbad5500c 
								
							 
						 
						
							
							
								
								add tests for activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 15:25:12 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								7c3838090f 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/notification.ex  
							
							
							
						 
						
							2019-09-04 10:14:15 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1d1ee406 
								
							 
						 
						
							
							
								
								Mastdon API: Add ability to get a remote account by nickname to  
							
							... 
							
							
							
							`/api/v1/accounts/:id` 
							
						 
						
							2019-09-03 19:26:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								eb17cc17a1 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-09-03 17:12:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b15cfd80ef 
								
							 
						 
						
							
							
								
								Return "total" optionally  
							
							
							
						 
						
							2019-09-03 13:58:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								a4c5f71e93 
								
							 
						 
						
							
							
								
								Return total from pagination + tests  
							
							
							
						 
						
							2019-09-02 22:48:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b49085c156 
								
							 
						 
						
							
							
								
								[ #1149 ] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.  
							
							
							
						 
						
							2019-09-02 14:57:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								d0f07e55d2 
								
							 
						 
						
							
							
								
								use atom key for fields  
							
							
							
						 
						
							2019-09-02 12:31:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								05c935c396 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2019-09-02 12:15:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								35ef470d00 
								
							 
						 
						
							
							
								
								truncate fields for remote users instead  
							
							
							
						 
						
							2019-09-02 12:15:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dd017c65a4 
								
							 
						 
						
							
							
								
								[ #1149 ] Refactored Oban workers API (introduced enqueue/3).  
							
							
							
						 
						
							2019-08-31 21:58:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								70eed0594c 
								
							 
						 
						
							
							
								
								credo fixes  
							
							
							
						 
						
							2019-08-31 13:08:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3ed3a622 
								
							 
						 
						
							
							
								
								Add back /api/qvitter/statuses/notifications/read.json  
							
							
							
						 
						
							2019-08-31 11:43:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								64410497d2 
								
							 
						 
						
							
							
								
								Remove TwitterAPI representers  
							
							
							
						 
						
							2019-08-31 10:41:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								985122cc03 
								
							 
						 
						
							
							
								
								Remove Activity, User and Notification views from TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:31:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								90c2dae9a4 
								
							 
						 
						
							
							
								
								Remove most of Pleroma.Web.TwitterAPI.TwitterAPI  
							
							
							
						 
						
							2019-08-31 10:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								7853b3f17d 
								
							 
						 
						
							
							
								
								Fix AntiFollowbotPolicy when trying to follow a relay  
							
							
							
						 
						
							2019-08-30 00:38:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d9d7765383 
								
							 
						 
						
							
							
								
								Merge branch 'fix-osada-follow' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: Fix follow handling when the actor is an object.
Closes  #1211 
See merge request pleroma/pleroma!1604  
							
						 
						
							2019-08-28 07:10:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66519f2100 
								
							 
						 
						
							
							
								
								Merge branch 'list-controller' into 'develop'  
							
							... 
							
							
							
							Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600  
							
						 
						
							2019-08-27 21:15:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								ffcd742aa0 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-08-27 17:37:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c30cc039e4 
								
							 
						 
						
							
							
								
								Transmogrifier: Use Containment.get_actor to get actors.  
							
							
							
						 
						
							2019-08-27 12:22:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								00abe099cd 
								
							 
						 
						
							
							
								
								added tests for ActivityPub.like\unlike  
							
							
							
						 
						
							2019-08-27 16:21:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd78e63a25 
								
							 
						 
						
							
							
								
								[ #1149 ] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.  
							
							
							
						 
						
							2019-08-27 14:34:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1739c596 
								
							 
						 
						
							
							
								
								Remove most of TwitterAPIController  
							
							
							
						 
						
							2019-08-27 12:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3da65292b3 
								
							 
						 
						
							
							
								
								Transmogrifier: Fix follow handling when the actor is an object.  
							
							
							
						 
						
							2019-08-26 14:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4194abbc8f 
								
							 
						 
						
							
							
								
								Move mastodon_api/*_controller.ex to mastodon_api/controllers/  
							
							
							
						 
						
							2019-08-26 19:37:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								30510ade0e 
								
							 
						 
						
							
							
								
								Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests  
							
							
							
						 
						
							2019-08-26 19:37:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4d82bc8b0b 
								
							 
						 
						
							
							
								
								Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController  
							
							
							
						 
						
							2019-08-26 19:16:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3b1b631c2a 
								
							 
						 
						
							
							
								
								Add validation in Pleroma.List.create/2  
							
							
							
						 
						
							2019-08-26 18:59:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc24422dc 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1177' into 'develop'  
							
							... 
							
							
							
							[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589  
							
						 
						
							2019-08-25 19:43:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								37dd3867bb 
								
							 
						 
						
							
							
								
								Log admin/moderator actions  
							
							
							
						 
						
							2019-08-25 19:39:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								503139b343 
								
							 
						 
						
							
							
								
								Merge branch 'fix-all-custom-fields-deleted' into 'develop'  
							
							... 
							
							
							
							Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596  
							
						 
						
							2019-08-25 19:35:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3549cd9754 
								
							 
						 
						
							
							
								
								Change to use attachment only when fields do not exist  
							
							
							
						 
						
							2019-08-25 01:28:38 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90986667ce 
								
							 
						 
						
							
							
								
								Merge branch 'admin-create-users' into 'develop'  
							
							... 
							
							
							
							user creation admin api will create multiple users
See merge request pleroma/pleroma!1170  
							
						 
						
							2019-08-24 16:04:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								efb8818e9e 
								
							 
						 
						
							
							
								
								Activity Expiration: Switch to 'expires_in' system.  
							
							
							
						 
						
							2019-08-24 17:22:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1692fa8945 
								
							 
						 
						
							
							
								
								ActivityExpirationWorker: Fix merge issues.  
							
							
							
						 
						
							2019-08-24 17:22:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								654d291b6d 
								
							 
						 
						
							
							
								
								update tests  
							
							
							
						 
						
							2019-08-24 17:41:53 +03:00