nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8798 commits 2 branches 0 tags 272 MiB
Commit graph

355 commits

Author SHA1 Message Date
sadposter 5f625c9136 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-03-08 19:07:55 +00:00
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop' 
Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225
 2020-03-07 09:32:29 +00:00
Mark Felder 05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
sadposter 3508f698b9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-03-03 11:16:59 +00: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 400fbc7629
wait in mix task while pleroma is rebooted 2020-03-01 12:36:09 +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/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
sadposter 7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-02-09 18:12:40 +00:00
rinpatch 8fda6303ba Fix email mix task on OTP releases 
Closes pleroma#1548
 2020-02-09 03:27:29 +03:00
sadposter 646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-29 11:05:19 +00: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
sadposter 4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-23 11:55:07 +00: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 9e10b90b5b
configure only console backend 2020-01-17 15:06:42 +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
sadposter 97f67e0786 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-11 10:01:04 +00: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
sadposter d3cee00057 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-09 18:17:59 +00: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 list task 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
sadposter acac6e3540 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-25 11:37:49 +00:00
rinpatch c2ad9fd5f9 Merge branch 'list-users' into 'develop' 
Add CLI list users command

See merge request pleroma/pleroma!1990
 2019-11-21 20:33:11 +00:00
Alex Schroeder fbc379d689 Add CLI list users command 2019-11-21 21:07:06 +01:00
Mark Felder edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. 
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
 2019-11-20 11:55:30 -06:00