| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Maxim Filippov | cc6875b582 | Add GET /api/pleroma/admin/relayendpoint - lists all followed relays | 2019-10-11 19:12:29 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 059005ff82 | Replace user.followingwith 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 |  | 
				
					
						| 
								
								
									 rinpatch | 1cae564b5d | Move config task docs to a separate file and mark it as WIP | 2019-10-03 14:12:57 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | e00403af23 | Mix tasks: derive moduledoc from doc files | 2019-10-03 14:00:23 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6baa037903 | Move database maintenance tasks docs to a separate file | 2019-10-03 11:17:29 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b4ca864c6b | Move user tasks docs to a separate file | 2019-10-03 10:15:24 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d39ccc2e7f | Move uploads task docs to a separate file | 2019-10-03 09:35:21 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 808d0a0170 | Move relay docs to a separate file | 2019-10-03 09:10:31 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6435ba83cd | Move instance CLI task docs to a text file | 2019-10-03 09:06:06 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 869ea2ab90 | Move digest email docs to a separate file and improve styling | 2019-10-03 01:10:36 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | bd9c7807fb | Move emoji task docs to a separate file | 2019-10-03 01:03:47 +03: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 Pechnikov | 1a858134ed | Merge branch 'develop' into issue/1218 | 2019-09-25 12:24:12 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 209395c7e6 | Add User.change_info/2 and User.update_info/2 | 2019-09-24 19:50:07 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 79b25be4e1 | Do not return tuple when unneeded | 2019-09-24 15:03:20 +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 |  | 
				
					
						| 
								
								
									 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 | 5a76d5d239 | Add extended benchmark | 2019-09-11 11:13:17 +03:00 |  |