Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								860b5c7804
								
							
						 | 
						
							
							
								
								Change user.deactivated field to user.is_active
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad79983614
								
							
						 | 
						
							
							
								
								Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
							
							
							
							
							
						 | 
						
							2021-01-08 17:32:42 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3342f6a7ef
								
							
						 | 
						
							
							
								
								Backups: render ID in API
							
							
							
							
							
						 | 
						
							2021-01-07 13:06:22 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1e7e4d379
								
							
						 | 
						
							
							
								
								Object: Rework how Object.normalize works
							
							
							
							
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 | 
						
							2021-01-04 13:38:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								713612c377
								
							
						 | 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.
							
							
							
							
							
							
							
							Defaults to Cachex. 
							
						 | 
						
							2020-12-18 17:44:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bb4f4e172
								
							
						 | 
						
							
							
								
								Merge branch 'support/2255_posix_errors' into 'develop'
							
							
							
							
							
							
							
							[#2255] added error messages for posix error code
See merge request pleroma/pleroma!3138 
							
						 | 
						
							2020-12-15 15:16:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c5d1cb9ed
								
							
						 | 
						
							
							
								
								fix tests
							
							
							
							
							
						 | 
						
							2020-11-18 09:58:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								25eb222bed
								
							
						 | 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)
							
							
							
							
							
						 | 
						
							2020-11-18 05:19:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb41bd1a85
								
							
						 | 
						
							
							
								
								Hide reactions from muted and blocked users
							
							
							
							
							
						 | 
						
							2020-11-16 22:50:14 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1830b6aae5
								
							
						 | 
						
							
							
								
								added error messages for posix error code
							
							
							
							
							
						 | 
						
							2020-11-13 15:21:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								504a829edb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
							
							
							
							
							
						 | 
						
							2020-11-04 15:38:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ca95cbe0b4
								
							
						 | 
						
							
							
								
								Add with_muted param to ChatController.index/2
							
							
							
							
							
						 | 
						
							2020-11-04 16:40:12 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								be52819a11
								
							
						 | 
						
							
							
								
								Hide chats from muted users
							
							
							
							
							
						 | 
						
							2020-11-02 17:51:54 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								38b481d112
								
							
						 | 
						
							
							
								
								Merge branch 'feature/account-export' into 'develop'
							
							
							
							
							
							
							
							Add account export
Closes #847
See merge request pleroma/pleroma!2918 
							
						 | 
						
							2020-10-31 17:03:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e41baff40
								
							
						 | 
						
							
							
								
								Add idempotency_key to the chat_message entity.
							
							
							
							
							
						 | 
						
							2020-10-31 05:50:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ca98f2d94
								
							
						 | 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)
							
							
							
							
							
						 | 
						
							2020-10-21 19:40:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								034ac43f3a
								
							
						 | 
						
							
							
								
								Fix credo warnings
							
							
							
							
							
						 | 
						
							2020-10-20 17:47:04 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ad605e3e16
								
							
						 | 
						
							
							
								
								Rename Pleroma.Backup to Pleroma.User.Backup
							
							
							
							
							
						 | 
						
							2020-10-20 17:16:58 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								98f32cf820
								
							
						 | 
						
							
							
								
								Fix tests
							
							
							
							
							
						 | 
						
							2020-10-19 17:19:45 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								aafdc975bd
								
							
						 | 
						
							
							
								
								federation_status: Add ApiSpec
							
							
							
							
							
						 | 
						
							2020-10-16 01:14:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3b5a7a6b14
								
							
						 | 
						
							
							
								
								federation_status: New endpoint showing unreachable instances
							
							
							
							
							
						 | 
						
							2020-10-16 01:14:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1fb9452131
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/account-export
							
							
							
							
							
						 | 
						
							2020-10-14 15:27:15 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b738f70953
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-10-13 10:08:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4c4ea9a348
								
							
						 | 
						
							
							
								
								changes after rebase
							
							
							
							
							
						 | 
						
							2020-10-13 17:10:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1d0e130cb3
								
							
						 | 
						
							
							
								
								fixes after rebase
							
							
							
							
							
						 | 
						
							2020-10-13 16:44:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								011525a3d1
								
							
						 | 
						
							
							
								
								EnsurePublicOrAuthenticatedPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e
								
							
						 | 
						
							
							
								
								RateLimiter module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8539e386c3
								
							
						 | 
						
							
							
								
								Add missing Copyright headers
							
							
							
							
							
						 | 
						
							2020-10-12 12:00:50 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								04b514c567
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-10-09 11:26:10 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								86ce4afd93
								
							
						 | 
						
							
							
								
								Improve backup urls
							
							
							
							
							
						 | 
						
							2020-10-07 18:34:29 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2c73bfe122
								
							
						 | 
						
							
							
								
								Add API endpoints for Backups
							
							
							
							
							
						 | 
						
							2020-10-07 18:34:29 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dbbc801667
								
							
						 | 
						
							
							
								
								pagination for remote emoji packs
							
							
							
							
							
						 | 
						
							2020-09-24 09:12:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								436d1a3c41
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'issue/2115'
							
							
							
							
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 | 
						
							2020-09-23 11:49:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								72d2b34d3b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1975
							
							
							
							
							
						 | 
						
							2020-09-22 21:42:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c95859e45b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
							
							
							
							
							
						 | 
						
							2020-09-22 17:13:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ec0dcf001
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/2099
							
							
							
							
							
						 | 
						
							2020-09-18 07:08:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bf269fe83
								
							
						 | 
						
							
							
								
								Fix MRF reject for ChatMessage
							
							
							
							
							
						 | 
						
							2020-09-17 22:07:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c41430b23e
								
							
						 | 
						
							
							
								
								Refactor with Chat.for_user_query/1
							
							
							
							
							
						 | 
						
							2020-09-11 14:10:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f88dc1937e
								
							
						 | 
						
							
							
								
								MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
							
							
							
							
							
						 | 
						
							2020-09-11 14:09:50 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								55562ca936
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-09-10 16:05:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9853c90abb
								
							
						 | 
						
							
							
								
								added paginate links to headers for  /chats/:id/messages
							
							
							
							
							
						 | 
						
							2020-09-10 12:39:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								917d325972
								
							
						 | 
						
							
							
								
								added api spec
							
							
							
							
							
						 | 
						
							2020-09-07 07:17:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ae56aafb2
								
							
						 | 
						
							
							
								
								added import mutes
							
							
							
							
							
						 | 
						
							2020-09-06 21:42:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b621a834a
								
							
						 | 
						
							
							
								
								Chats: Add cascading delete on both referenced users.
							
							
							
							
							
							
							
							Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases. 
							
						 | 
						
							2020-08-31 16:48:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								78939c1d16
								
							
						 | 
						
							
							
								
								ChatController: Don't die if the recipient is gone.
							
							
							
							
							
						 | 
						
							2020-08-27 12:13:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0922791e4d
								
							
						 | 
						
							
							
								
								updated errors on add emoji
							
							
							
							
							
						 | 
						
							2020-08-22 10:56:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5845ff033
								
							
						 | 
						
							
							
								
								upload emoji zip file
							
							
							
							
							
						 | 
						
							2020-08-22 10:42:02 +03:00 | 
						
						
							
							
							
								
							
							
						 |