| 
								
								
									 Alexander Strizhakov | 509c81e4b1 | Merge branch 'develop' into gun | 2020-03-03 10:08:07 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6da6540036 | Bump copyright years of files changed after 2020-01-07 Done via the following command:
git diff fcd5dd259a--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' | 2020-03-02 06:08:45 +01:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 814b275af7 | Merge branch 'develop' into gun | 2020-02-29 11:34:50 +03:00 |  | 
				
					
						| 
								
								
									 lain | fda6f35a46 | Merge branch 'feat/instance-gen-improvements' into 'develop' small instance.gen task improvements
See merge request pleroma/pleroma!2245 | 2020-02-26 08:26:16 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3bbfebd1c2 | instance.gen task: make example instance name less confusing See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217 | 2020-02-26 00:32:34 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 359faa8645 | instance.gen task: remind to transfer the config to the database after migrations | 2020-02-25 22:13:08 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | cfa28dee32 | instance.gen task: make instance name default to the domain | 2020-02-25 21:59:37 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 22018adae6 | Fix Dialyzer warnings | 2020-02-25 18:34:56 +04:00 |  | 
				
					
						| 
								
								
									 rinpatch | 035c2c1415 | Merge branch 'fix/instance-gen-custom-static' into 'develop' instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237 | 2020-02-24 20:52:10 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5e4fe0e8f7 | instance.gen task: fix crash when using custom static directory Closes #1082 | 2020-02-24 23:42:24 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7ad5c51f23 | Admin API: GET /api/pleroma/admin/statsto get status count by visibility scope | 2020-02-24 21:46:37 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 8efae966b1 | open conn in separate task | 2020-02-24 19:56:27 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 514c899275 | adding gun adapter | 2020-02-18 08:19:01 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8fda6303ba | Fix email mix task on OTP releases Closes pleroma#1548 | 2020-02-09 03:27:29 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 4eb935be78 | Create pleroma.email mix task Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061 | 2020-01-28 16:49:38 +01:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 6252e82f85 | respect settings from database in mix tasks | 2020-01-25 10:33:27 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | e8e57e398f | restart config id after truncate | 2020-01-23 17:48:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4344c5d5b9 | truncate config table on migrate to db task | 2020-01-23 17:23:02 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f01ab6cd29 | some refactor and tests | 2020-01-21 18:42:00 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | efb8ef5abe | releases support | 2020-01-18 17:14:50 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7676ed8239 | some clean up | 2020-01-17 16:28:44 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | ce027fd0ef | revert non needable | 2020-01-17 15:13:24 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b310feeccb | compile fix | 2020-01-17 15:00:20 +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 | 66de2b159b | don't migrate Pleroma.Web.EndPoint settings don't set Logger level to all tasks | 2020-01-15 17:08:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 3453b27015 | don't migrate prometheus settings | 2020-01-10 21:24:06 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | eadb674c41 | don't migrate configurable_from_database setting | 2020-01-10 19:44:30 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7d128ca208 | dynamic_configuration renaming and moving it from instance settings | 2020-01-10 19:34:19 +03:00 |  | 
				
					
						| 
								
								
									 Alexander | a71393dd29 | fix for endpoints after env update | 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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 835ac2157c | Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes # Conflicts:
#	CHANGELOG.md | 2019-12-10 08:55:14 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 9dfaa0b832 | fix loads config variable with large value from db | 2019-12-09 22:29:44 +03:00 |  | 
				
					
						| 
								
								
									 lain | f3c2363f4a | Merge branch 'fix/user-list-task' into 'develop' Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029 | 2019-12-09 14:44:56 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 13926537b6 | Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes | 2019-12-06 00:26:31 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | af42c00cff | [#1427] Reworked admin scopes support. Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s). | 2019-12-06 00:25:44 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 356a936ecb | Fix mix pleroma.user listtask | 2019-12-02 18:11:45 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | a36607c27e | add mix task to set\unset privacy option of notification | 2019-11-28 22:13:28 +03:00 |  | 
				
					
						| 
								
								
									 Alex Schroeder | fbc379d689 | Add CLI list users command | 2019-11-21 21:07:06 +01:00 |  | 
				
					
						| 
								
								
									 Alexander | 6a4201e0b4 | fix for migrate task | 2019-11-10 22:54:37 +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 | c6fdfbc4f1 | Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation # Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs | 2019-10-20 20:43:18 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e8843974cb | [#1304] Moved remaining fields from User.Info to User. Misc. fixes / improvements. | 2019-10-20 13:42:42 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | fd6d05dc45 | Merge branch 'mix-emoji-task-pack-json' into 'develop' For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748 | 2019-10-19 08:51:03 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 019147f115 | Merge branch 'develop' into feature/relay-list | 2019-10-18 18:35:58 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 39e996528c | Fix a migration wiping user info of users that don't have any mutes And introduce safe_jsonb_set | 2019-10-18 15:22:07 +03: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 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | fbe5a00475 | For pleroma.emoji downloaded packs, generate pack.json instead | 2019-10-15 09:53:28 +03:00 |  |