sadposter
|
be48c1bafb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-06-19 10:40:55 +01: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 |
|
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 |
|
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 |
|
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 |
|
