Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								a2e92a1b8a 
								
							 
						 
						
							
							
								
								remove remaining errors from tests  
							
							 
							
							
							
						 
						
							2019-10-04 16:05:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7d5f20b50f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts commit fe7fd33126 , reversing
changes made to 4fabf83ad0 . 
							
						 
						
							2019-10-04 16:01:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								565b8d02c8 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle compact objects in undos.  
							
							 
							
							
							
						 
						
							2019-09-30 16:25:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c6e5639d3 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex  
							
							 
							
							
							
						 
						
							2019-09-26 03:46:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cfd9f73f0d 
								
							 
						 
						
							
							
								
								Credo considered harmful  
							
							 
							
							
							
						 
						
							2019-09-26 03:46:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9d32f38b39 
								
							 
						 
						
							
							
								
								Remove useless with clause  
							
							 
							
							
							
						 
						
							2019-09-26 03:46:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								22a16a3e81 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-26 03:46:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d4a76b0a6f 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							 
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-26 03:45:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ea1867f48e 
								
							 
						 
						
							
							
								
								Merge branch 'config-changes' into 'develop'  
							
							 
							
							... 
							
							
							
							two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666 
(cherry picked from commit 9c64a25713 )
69faec03  markdown generation to the new file
c625fe6f  config.md back
4da0da9a  don't track generated_config.md 
							
						 
						
							2019-09-14 17:27:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								056780fd8e 
								
							 
						 
						
							
							
								
								Mastodon API: Respect post privacy in favourited/reblogged endpoints  
							
							 
							
							
							
						 
						
							2019-09-14 15:21:15 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 .
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it. 
							
						 
						
							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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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