sadposter
|
6a6260f64e
|
re-enable deactivated check
|
2021-12-06 12:03:16 +00:00 |
|
|
|
db46913dcc
|
make linter happy
|
2021-12-06 11:50:51 +00:00 |
|
|
|
cd8bdbc761
|
Make deactivated user check into a subquery
Fixes #2792
|
2021-12-06 11:44:17 +00:00 |
|
sadposter
|
b63dd6a5a2
|
don't track vmargs
|
2021-12-06 10:23:02 +00:00 |
|
sadposter
|
f8d97a07b9
|
remove vmargs
|
2021-12-06 10:22:39 +00:00 |
|
sadposter
|
ca2bd8b72b
|
remove deactivated_users call
|
2021-12-06 10:18:16 +00:00 |
|
sadposter
|
6f86baf491
|
update adminfe
|
2021-12-06 10:17:54 +00:00 |
|
Alex Gleason
|
949a53e327
|
Log Ecto queries > 500ms
|
2021-12-05 18:29:33 -05:00 |
|
sadposter
|
bb54720778
|
add debug
|
2021-12-05 21:56:11 +00:00 |
|
sadposter
|
c85b278f1e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-12-05 15:01:23 +00:00 |
|
Alex Gleason
|
ce4560c2a1
|
Fix benchmarks
|
2021-12-03 16:20:54 -05:00 |
|
lain
|
5c573a8a28
|
Merge branch 'password-reset' into 'develop'
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
|
2021-12-03 15:13:10 +00:00 |
|
Alex Gleason
|
ba2ed3c255
|
Fix frontend_status_plug_test.exs
|
2021-12-03 07:56:26 -06:00 |
|
Alex Gleason
|
8286ceb465
|
Merge remote-tracking branch 'origin/develop' into password-reset
|
2021-12-03 00:11:38 -06:00 |
|
Alex Gleason
|
5da4f33bf1
|
Restore POST /auth/password
|
2021-12-03 00:10:57 -06:00 |
|
lain
|
235c4139d7
|
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
|
2021-12-02 16:54:28 +00:00 |
|
marcin mikołajczak
|
cd5fb84b76
|
remote_interaction API endpoint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-02 16:08:44 +01:00 |
|
lain
|
aaed93db27
|
Merge branch 'update-hackney' into 'develop'
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
|
2021-12-01 15:49:57 +00:00 |
|
lain
|
d486d7d09e
|
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'
Force pinned_objects to be empty, not null
Closes #2788
See merge request pleroma/pleroma!3548
|
2021-11-29 18:08:10 +00:00 |
|
|
|
182c563ed0
|
Force pinned_objects to be empty, not null
|
2021-11-29 18:08:09 +00:00 |
|
|
|
809503011f
|
Mix: upgrade Hackney to 1.18.0
|
2021-11-29 17:28:10 +00:00 |
|
Alex Gleason
|
6519f59d91
|
v2 Suggestions: return is_suggested through the API
|
2021-11-26 23:10:01 -06:00 |
|
Alex Gleason
|
8dc1d2201a
|
Instance: add v2_suggestions feature
|
2021-11-26 22:45:49 -06:00 |
|
Alex Gleason
|
e5a7547fbe
|
v2 Suggestions: also filter out users you follow
|
2021-11-26 21:46:08 -06:00 |
|
Alex Gleason
|
437c1a5a52
|
v2 Suggestions: actually flter out dismissed suggestions
|
2021-11-26 21:09:37 -06:00 |
|
Alex Gleason
|
aee55b9a8b
|
v2 Suggestions: dismiss a suggestion
|
2021-11-26 20:19:29 -06:00 |
|
Alex Gleason
|
da06e1a17f
|
v2 Suggestions: add index on is_suggested column
|
2021-11-26 15:32:01 -06:00 |
|
Alex Gleason
|
6c0484d571
|
AdminAPI: suggest a user through the API
|
2021-11-26 15:19:01 -06:00 |
|
Alex Gleason
|
e28d990ecb
|
v2 Suggestions: don't skip visibility check
|
2021-11-26 14:46:29 -06:00 |
|
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
2021-11-26 14:34:10 -06:00 |
|
Alex Gleason
|
7e1caddc58
|
v2 Suggestions: return empty array
|
2021-11-25 14:57:36 -06:00 |
|
Alex Gleason
|
720198d569
|
Merge remote-tracking branch 'pleroma/develop' into manifest
|
2021-11-24 17:58:58 -06:00 |
|
Alex Gleason
|
cb9359335f
|
Expose /manifest.json for PWA
|
2021-11-24 17:50:55 -06:00 |
|
marcin mikołajczak
|
d64d1b1d45
|
Fix replies count for remote replies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-23 11:31:09 +01:00 |
|
rinpatch
|
588bcbac55
|
Apply 2 suggestion(s) to 2 file(s)
|
2021-11-22 10:54:44 +00:00 |
|
marcin mikołajczak
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 18:17:06 +01:00 |
|
marcin mikołajczak
|
cb76faece9
|
Update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:51:00 +01:00 |
|
marcin mikołajczak
|
106b5c2678
|
Fix a typo
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:36:37 +01:00 |
|
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
sadposter
|
a61207cf8f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-11-19 13:43:24 +00:00 |
|
|
|
efc28812b8
|
Add changelog entry
|
2021-11-17 00:39:10 +01:00 |
|
Haelwenn
|
c97f99ccf2
|
Merge branch 'bugfix/markdown-newlines' into 'develop'
mix: Update earmark
See merge request pleroma/pleroma!3538
|
2021-11-16 13:54:34 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5e15ceb49d
|
mix: Update earmark
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
|
2021-11-16 14:33:27 +01:00 |
|
lain
|
add2b9cd8d
|
Merge branch 'update-elixir' into 'develop'
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
|
2021-11-15 20:17:38 +00:00 |
|
Lain Soykaf
|
f78cb6ab9a
|
CI: Upload the image for all platforms
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
|
2021-11-15 21:04:43 +01:00 |
|
|
|
04aca335aa
|
nodeinfo: report activeMonth and activeHalfyear users fields
|
2021-11-15 17:01:30 +01:00 |
|
lain
|
4d341f51e1
|
Merge branch 'fix-tests' into 'develop'
Test fixes
See merge request pleroma/pleroma!3532
|
2021-11-15 14:31:27 +00:00 |
|
lain
|
e2772d6bf1
|
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
|
2021-11-15 14:27:59 +00:00 |
|
lain
|
6e3df11693
|
Merge branch 'instance-deletion' into 'develop'
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
|
2021-11-15 14:24:13 +00:00 |
|
lain
|
6aff3d3204
|
Merge branch 'fix-object-deletion-timeout' into 'develop'
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes #2704
See merge request pleroma/pleroma!3479
|
2021-11-15 13:21:42 +00:00 |
|
