feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								a182d400d7
								
							
						 | 
						
							
							
								
								Merge branch 'fix_for_migrate_to_db_test' into 'develop'
							
							
							
							
							
							
							
							Fix for migrate to db test
See merge request pleroma/pleroma!2133 
							
						 | 
						
							2020-01-24 00:25:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4344c5d5b9
								
							
						 | 
						
							
							
								
								truncate config table on migrate to db task
							
							
							
							
							
						 | 
						
							2020-01-23 17:23:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2bad25cf14
								
							
						 | 
						
							
							
								
								fix for migrate to db test
							
							
							
							
							
						 | 
						
							2020-01-23 15:13:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								efb8ef5abe
								
							
						 | 
						
							
							
								
								releases support
							
							
							
							
							
						 | 
						
							2020-01-18 17:14:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60ba2339a2
								
							
						 | 
						
							
							
								
								saving to DB only added by user settings
							
							
							
							
							
						 | 
						
							2020-01-17 11:45:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								29155137fd
								
							
						 | 
						
							
							
								
								renaming
							
							
							
							
							
							
							
							Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB 
							
						 | 
						
							2020-01-16 08:50:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59ba5c80b9
								
							
						 | 
						
							
							
								
								little cleanup
							
							
							
							
							
						 | 
						
							2020-01-15 17:10:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208
								
							
						 | 
						
							
							
								
								dynamic_configuration renaming
							
							
							
							
							
							
							
							and moving it from instance settings 
							
						 | 
						
							2020-01-10 19:34:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e412d2f152
								
							
						 | 
						
							
							
								
								test fixes after rebase
							
							
							
							
							
						 | 
						
							2020-01-10 15:52:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fea734ca70
								
							
						 | 
						
							
							
								
								errors on endpoints
							
							
							
							
							
						 | 
						
							2020-01-10 15:52:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0656816c77
								
							
						 | 
						
							
							
								
								tests for setttings without an explicit key
							
							
							
							
							
						 | 
						
							2020-01-10 15:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2753285b77
								
							
						 | 
						
							
							
								
								config editing through database
							
							
							
							
							
						 | 
						
							2020-01-10 15:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9dfaa0b832
								
							
						 | 
						
							
							
								
								fix loads config variable with large value from db
							
							
							
							
							
						 | 
						
							2019-12-09 22:29:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c1dd55c48
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
							
							
							
							
							
						 | 
						
							2019-10-24 14:55:36 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4ea1a61b00
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/following-relationships
							
							
							
							
							
						 | 
						
							2019-10-21 14:19:15 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								10ff01acd9
								
							
						 | 
						
							
							
								
								[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
							
							
							
							
							
						 | 
						
							2019-10-16 21:59:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82
								
							
						 | 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship
							
							
							
							
							
						 | 
						
							2019-10-11 02:35:32 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d537bfd4e1
								
							
						 | 
						
							
							
								
								Add a task to re-count statuses for all users
							
							
							
							
							
						 | 
						
							2019-10-09 13:11:57 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								48a82c4609
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/user' into 'develop'
							
							
							
							
							
							
							
							Simplify updating user's `info`
See merge request pleroma/pleroma!1712 
							
						 | 
						
							2019-09-26 03:00:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd4263da5a
								
							
						 | 
						
							
							
								
								Apply suggestion to test/tasks/instance_test.exs
							
							
							
							
							
						 | 
						
							2019-09-25 17:47:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b2e4a0ae0
								
							
						 | 
						
							
							
								
								clears robot.txt after tests
							
							
							
							
							
						 | 
						
							2019-09-25 13:27:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								209395c7e6
								
							
						 | 
						
							
							
								
								Add User.change_info/2 and User.update_info/2
							
							
							
							
							
						 | 
						
							2019-09-24 19:50:07 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed in 2019
							
							
							
							
							
							
							
							Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 | 
						
							2019-09-18 23:21:11 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								73bcbf4fa3
								
							
						 | 
						
							
							
								
								add tests
							
							
							
							
							
						 | 
						
							2019-08-24 11:03:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								256ff09aa8
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 | 
						
							2019-08-22 20:59:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8340fe8fcc
								
							
						 | 
						
							
							
								
								Merge branch 'digest-template' into 'develop'
							
							
							
							
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565 
							
						 | 
						
							2019-08-20 12:55:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								75a5dd41ee
								
							
						 | 
						
							
							
								
								Add more tests for Database tasks and DigestEmailWorker
							
							
							
							
							
						 | 
						
							2019-08-19 16:10:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a320358703
								
							
						 | 
						
							
							
								
								added test helpers to clear config after tests
							
							
							
							
							
						 | 
						
							2019-08-19 15:34:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e652cef76b
								
							
						 | 
						
							
							
								
								removes duplicates from relay subscription list
							
							
							
							
							
						 | 
						
							2019-08-19 13:39:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								af4cf35e20
								
							
						 | 
						
							
							
								
								Strip internal fields including likes from incoming and outgoing activities
							
							
							
							
							
						 | 
						
							2019-08-10 18:47:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								05b5af8075
								
							
						 | 
						
							
							
								
								Add tests for users tasks and PleromaAuthenticator
							
							
							
							
							
						 | 
						
							2019-07-22 02:43:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8607c151c
								
							
						 | 
						
							
							
								
								migrating task refactor
							
							
							
							
							
						 | 
						
							2019-07-15 15:45:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								ade213cb35
								
							
						 | 
						
							
							
								
								robots txt test fix
							
							
							
							
							
						 | 
						
							2019-07-10 17:42:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								75be90a6d1
								
							
						 | 
						
							
							
								
								Merge branch 'release/listener' into 'develop'
							
							
							
							
							
							
							
							add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393 
							
						 | 
						
							2019-07-10 05:14:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								93a0eeab16
								
							
						 | 
						
							
							
								
								Add license/copyright to all project files
							
							
							
							
							
						 | 
						
							2019-07-10 05:13:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d0ae264fc
								
							
						 | 
						
							
							
								
								add listener port and ip option for 'pleroma.instance gen' and enable its test
							
							
							
							
							
						 | 
						
							2019-07-10 01:46:49 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e6e5d8042
								
							
						 | 
						
							
							
								
								reverse proxy tests
							
							
							
							
							
						 | 
						
							2019-07-09 16:54:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6705144a2
								
							
						 | 
						
							
							
								
								don't delete config settings on admin update
							
							
							
							
							
						 | 
						
							2019-06-27 04:19:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c63c67512
								
							
						 | 
						
							
							
								
								Rework user deletion
							
							
							
							
							
						 | 
						
							2019-06-24 18:59:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								982cad0268
								
							
						 | 
						
							
							
								
								support for config groups
							
							
							
							
							
						 | 
						
							2019-06-23 08:16:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								32320c1ee9
								
							
						 | 
						
							
							
								
								Fixes for dynamic configuration
							
							
							
							
							
						 | 
						
							2019-06-20 17:43:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4fa6b99ac
								
							
						 | 
						
							
							
								
								aliases for mix tasks
							
							
							
							
							
							
							
							ecto.migrate
ecto.rollback 
							
						 | 
						
							2019-06-19 10:33:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2ca1f22a2
								
							
						 | 
						
							
							
								
								it is changed in compile time
							
							
							
							
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 | 
						
							2019-06-14 15:45:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb2bcee842
								
							
						 | 
						
							
							
								
								User Search: Boost friends more strongly.
							
							
							
							
							
						 | 
						
							2019-06-06 16:18:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c303afc8b
								
							
						 | 
						
							
							
								
								Remove duplicated entries in users' following lists
							
							
							
							
							
						 | 
						
							2019-05-16 20:04:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								73ae58fdfa
								
							
						 | 
						
							
							
								
								Feature/896 toggling confirmation
							
							
							
							
							
						 | 
						
							2019-05-16 13:23:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cdf6d3b9
								
							
						 | 
						
							
							
								
								Use User.get_cached* everywhere
							
							
							
							
							
						 | 
						
							2019-04-22 07:20:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe511a6c65
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/788-separate-email-addresses
							
							
							
							
							
						 | 
						
							2019-04-10 18:06:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe13a1d78c
								
							
						 | 
						
							
							
								
								adding notify_email setting for trigger emails
							
							
							
							
							
						 | 
						
							2019-04-10 17:57:41 +07:00 | 
						
						
							
							
							
								
							
							
						 |