Mark Felder
97201f7e37
Need to start web_resp cache or mix task fails
2020-11-17 15:15:53 +00:00
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
sadposter
7947236575
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-11-15 19:40:23 +00:00
Alex Gleason
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
rinpatch
cc45c69fff
Remove release_env
...
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
2020-11-08 11:56:09 +03:00
sadposter
ddf36b096e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-11-01 12:22:28 +00:00
Egor Kislitsyn
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
Maksim Pechnikov
2030ffd490
fix test
2020-10-15 22:31:52 +03:00
Maksim Pechnikov
cf53e300f8
added generate the release env to pleroma.instance gen
2020-10-15 22:31:00 +03:00
Maksim
e2333f757a
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 22:29:28 +03:00
Maksim
499df7b73a
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 22:29:18 +03:00
Maksim Pechnikov
14054cd004
update task messages
2020-10-15 22:28:49 +03:00
Maksim Pechnikov
20e68b30f0
added generated pleroma.env
2020-10-15 22:28:26 +03:00
Alex Gleason
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
Mark Felder
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
Alexander Strizhakov
6bf85440b3
mix tasks consistency
2020-10-13 16:33:24 +03:00
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
Mark Felder
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
sadposter
a9938611f7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-10-02 15:09:47 +01:00
Maksim Pechnikov
de993b856b
added force
option to the unfollow operation
2020-09-28 09:16:42 +03:00
Mark Felder
8b84ca4901
Simplify the value comparison
2020-09-25 10:37:59 -05:00
Mark Felder
81faf540b3
Add some user feedback
2020-09-24 18:35:20 -05:00
Mark Felder
e33360fdb9
Cannot use batches with User.try_send_confirmation_email/1
2020-09-24 18:23:47 -05:00
Mark Felder
935ef21b02
Use the import
2020-09-24 16:47:34 -05:00
Mark Felder
8af8eb5ce7
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
2020-09-23 12:32:47 -05:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
2020-09-17 09:32:50 -05:00
Maksim Pechnikov
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
2020-09-16 09:47:18 +03:00
sadposter
95a1e5bf5a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-09-15 17:21:18 +01:00
Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
Alexander Strizhakov
ab56dd54e7
use Pleroma.HTTP in emoji packs tasks
2020-09-10 11:23:39 +03:00
sadposter
d0ffefc270
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-09-09 09:35:48 +01:00
Mark Felder
d23d0c27c2
Handle possibility of user account in a bulk operation not having an email address
2020-09-08 16:48:54 -05:00
Mark Felder
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
Mark Felder
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -05:00
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
sadposter
1c44d476e7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-09-07 09:57:00 +01:00
lain
f26b580e80
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
2020-09-03 11:29:39 +02:00
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
Sean King
0a9c63fb43
Fix frontend install mix task bug
2020-09-01 12:20:32 -06:00
sadposter
7ac5f210ea
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-30 02:05:25 +01:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
sadposter
166db7a3b6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-24 17:04:51 +01:00
Alexander Strizhakov
4727030f59
fixes for mix tasks
...
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
2020-08-19 11:06:03 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
Hugo Müller-Downing
317b6c6c52
Start :ssl if not started when running migration or rollback
2020-08-17 17:34:03 +10:00
sadposter
735ceb2115
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-13 20:03:33 +01:00
Alexander Strizhakov
29a7bcd5bb
reverting pinned posts in filtering
2020-08-12 20:01:21 +03:00
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
2020-08-12 19:46:47 +03:00
Alexander Strizhakov
eec1ba232c
don't expire pinned posts
2020-08-12 15:15:17 +03:00
Mark Felder
724ed354f2
Ensure only Note objects are set to expire
2020-08-11 11:28:22 -05:00
Mark Felder
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
2020-08-10 11:32:24 -05:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
Mark Felder
cf4c97242b
Ensure we only expire Create activities with the Mix task
2020-08-08 12:40:52 -05:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
lain
e5ab5fbe76
Mix task frontend: Read the docs.
2020-08-07 15:01:08 +02:00
sadposter
992deaa09b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-08-01 19:32:31 +01:00
lain
7e01339ddd
Frontend mix task: Support installation from local file.
2020-07-31 17:58:50 +02:00
lain
2e20ceee52
Mix tasks: Add frontend task to download and install frontends.
...
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-07-30 14:12:41 +02:00
lain
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
2020-07-29 13:45:15 +00:00
Mark Felder
65a1b048a8
Ensure Oban is available during mix tasks.
...
Fixes: mix pleroma.user rm username
2020-07-24 12:06:56 -05:00
Mark Felder
9be6668236
Fix mix tasks that make HTTP calls by starting the Gun connection pool
2020-07-24 12:05:42 -05:00
Maksim
16da9f5cfd
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:28 +00:00
Maksim
c72676d22f
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:17 +00:00
Maksim Pechnikov
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03:00
Maksim Pechnikov
4e0e19a706
update task messages
2020-07-16 08:52:14 +03:00
Maksim Pechnikov
3062f86613
added generated pleroma.env
2020-07-14 09:05:34 +03:00
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
Mark Felder
d1cd3f4ec0
Lint
2020-07-13 10:32:17 -05:00
Mark Felder
e1908a5270
Pick up env for both source and OTP installs
2020-07-13 08:39:56 -05:00
Mark Felder
46b123cded
Still allow passing the arg, but fallback to MIX_ENV
2020-07-12 10:59:12 -05:00
Mark Felder
133004e22d
Improve database config migration and add documentation
2020-07-12 10:38:07 -05:00
lain
48f98a2748
Merge branch 'mix-tasks-improvement' into 'develop'
...
Mix tasks improvement
See merge request pleroma/pleroma!2723
2020-07-10 08:58:44 +00:00
sadposter
02a2f25027
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-07-09 22:22:25 +01:00
Alexander Strizhakov
79707e879d
cleap up
2020-07-09 19:13:16 +03:00
Alexander Strizhakov
d5fcec8315
fix for info after tag/untag user
2020-07-09 18:59:48 +03:00
Mark Felder
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
Alexander Strizhakov
4cbafcef0c
load default config in mix tasks
2020-07-09 11:17:43 +03:00
Alexander Strizhakov
b28cc15459
don't restart pleroma in mix tasks
2020-07-08 15:58:47 +03:00
Alexander Strizhakov
72ad3a66f4
don't fully start pleroma in mix tasks
2020-07-08 15:58:47 +03:00
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
Roman Chvanikov
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
lain
4cb7b1ebc6
Apply suggestion to lib/mix/tasks/pleroma/config.ex
2020-06-20 09:34:34 +00:00
sadposter
be48c1bafb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-06-19 10:40:55 +01:00
Maksim Pechnikov
02a5648feb
fixed migration the settings to DB
2020-06-17 09:15:35 +03:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
Mark Felder
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
Mark Felder
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
Roman Chvanikov
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
sadposter
780ac9cedb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-06-06 18:20:10 +01:00
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
2020-05-29 15:33:35 +00:00
Alexander Strizhakov
ae05792d2a
get-packs for local generated pack
2020-05-28 19:41:34 +03:00
Mark Felder
92fba24c74
Alpha sort
2020-05-27 17:17:06 -05:00
Mark Felder
30f96b19c1
Abstract out the database maintenance. I'd like to use this from AdminFE too.
2020-05-27 16:40:51 -05:00
Mark Felder
0d57e06626
Make clearer that this is time and resource consuming
2020-05-27 16:31:37 -05:00
Mark Felder
73ca57e4f1
Make it obvious a full vacuum can take a while
2020-05-27 16:27:29 -05:00
Mark Felder
a2f57bd82b
Permit easy access to vaccum full and analyze via a mix task
2020-05-27 16:27:07 -05:00
lain
e0d1a942a6
Merge branch 'issue/1707' into 'develop'
...
[#1707 ] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
2020-05-21 14:32:49 +00:00
lain
283fb1e05b
Merge branch 'issue/749' into 'develop'
...
[#749 ] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
2020-05-21 13:27:44 +00:00
Maksim Pechnikov
9bc5e18ade
rename mix task: pleroma.user unsubscribe
-> pleroma.user deactivate
2020-05-21 08:06:57 +03:00
Maksim Pechnikov
c96f425cb0
fixed mix pleroma.instance gen
2020-05-20 21:30:41 +03:00
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
lain
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
Michael Weiss
ae3b0b4c0d
Fix digest mix task on OTP releases
...
This is based on #2191 , credit belongs to @rinpatch.
2020-05-13 13:34:03 +02:00
Maksim Pechnikov
63477d07ad
unsubscribes of friends when user deactivated
2020-05-12 08:14:42 +03:00
Roman Chvanikov
56819f7f06
Use index on refresh_counter_cache
2020-05-09 13:13:26 +03:00
Roman Chvanikov
01b06d6dbf
Show progress in refresh_counter_cache task
2020-05-09 11:43:31 +03:00
Roman Chvanikov
39d2f2118a
update counter_cache logic
2020-05-09 01:20:50 +03:00
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
sadposter
e18958a5d7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-05-08 14:12:33 +01:00
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
lain
51f1dbf0a2
User deletion mix task: Use common pipeline.
2020-05-01 14:05:25 +02:00
sadposter
eee32fd993
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-04-18 16:16:27 +01:00
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
sadposter
bc6f1705f5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-04-12 21:37:22 +01:00
rinpatch
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
2020-04-12 18:49:31 +03:00
sadposter
8cec5796ae
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-04-06 14:44:26 +01:00
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
Alexander Strizhakov
1f29ecdcd7
sync with develop
2020-03-30 11:42:25 +03:00
sadposter
931d663a3a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-03-29 20:57:38 +01:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
rinpatch
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-11 15:16:18 +00:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
Alexander Strizhakov
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
sadposter
5f625c9136
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-03-08 19:07:55 +00:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03: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
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06: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
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +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
400fbc7629
wait in mix task while pleroma is rebooted
2020-03-01 12:36:09 +03: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/stats
to 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
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
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
2019-11-19 16:01:17 -06:00
sadposter
2de30812ea
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-11-13 00:10:01 +00:00
Alexander
6a4201e0b4
fix for migrate task
2019-11-10 22:54:37 +03:00
sadposter
55ce1daeaf
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-29 10:47:37 +00:00
sadposter
1d85dc62aa
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-25 12:08:37 +01:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
sadposter
85b9992f86
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-22 09:12:39 +01: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/relay
endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Egor Kislitsyn
059005ff82
Replace user.following
with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
sadposter
58f9ce0deb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-10 10:28:16 +01:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
sadposter
59e6b48553
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-04 11:48:39 +01: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
sadposter
1e11b97c1b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-26 23:22:24 +01: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
sadposter
f82d9e1359
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-25 13:33:10 +01: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
sadposter
ab55e41626
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-14 00:20:56 +01: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
Alex S
38b29779c3
refactoring
2019-09-11 09:25:33 +03:00
Alex S
57dc59d98d
little fix
2019-09-11 09:25:33 +03:00
Alex S
8f5ee7db06
typo fix
2019-09-11 09:25:33 +03:00
Alex S
6721301086
some changes
2019-09-11 09:25:33 +03:00
Alex S
0559c82bdb
fix
2019-09-11 09:25:33 +03:00
Alex S
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
2019-09-10 22:01:45 +03:00
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
sadposter
cc28184854
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-27 08:58:51 +01: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
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
sadposter
3fc4b078f2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-16 10:54:53 +01:00
rinpatch
1ad71592ad
Parallelize template rendering
2019-08-15 18:05:50 +03:00
rinpatch
a9e75fa6a4
Add a task to benchmark timeline rendering
2019-08-15 00:43:02 +03:00
Egor Kislitsyn
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
sadposter
59c9b90169
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-10 23:43:32 +01:00