Alex Gleason
|
a43b8f8bb0
|
Merge remote-tracking branch 'origin/develop' into v2-suggestions
|
2021-11-26 22:47:05 -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
|
ed9d1f4f2f
|
Merge branch 'force_pinned_objects_to_exist' into 'develop'
Force pinned_objects to be empty, not null
See merge request soapbox-pub/soapbox!56
|
2021-11-25 16:34:48 +00:00 |
|
NEETzsche
|
929e60122f
|
Force pinned_objects to be empty, not null
|
2021-11-25 16:34:48 +00:00 |
|
Alex Gleason
|
e62d5d08f5
|
Merge branch 'nil_pinned_objects_cope' into 'develop'
Don't blow up when there are nil pinned objects on a user
Closes #49
See merge request soapbox-pub/soapbox!54
|
2021-11-25 01:37:56 +00:00 |
|
Alex Gleason
|
8fb32107ac
|
Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA
See merge request soapbox-pub/soapbox!55
|
2021-11-25 00:18:44 +00: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 |
|
NEETzsche
|
fb0bddfe08
|
Refactor pinned_object_ids into a variable
|
2021-11-24 17:01:54 +00:00 |
|
NEETzsche
|
8612f0ac79
|
Format activity_pub.ex
|
2021-11-24 07:41:44 +00:00 |
|
NEETzsche
|
845f3d226f
|
Don't blow up when there are nil pinned objects on a user
|
2021-11-24 07:33:42 +00:00 |
|
|
|
d64d1b1d45
|
Fix replies count for remote replies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-23 11:31:09 +01:00 |
|
Alex Gleason
|
ec38d0f516
|
Merge branch 'upgrade-eblurhash' into 'develop'
Upgrade eblurhash to v1.2.2
See merge request soapbox-pub/soapbox!53
|
2021-11-23 03:21:28 +00:00 |
|
Alex Gleason
|
44b7336f35
|
Upgrade eblurhash to v1.2.2
|
2021-11-22 21:01:23 -06:00 |
|
Alex Gleason
|
0f46b33ca6
|
Merge branch 'pleroma-v2.4.0' into 'develop'
Merge Pleroma v2.4.1
See merge request soapbox-pub/soapbox!49
|
2021-11-23 02:46:30 +00:00 |
|
Alex Gleason
|
40a76612d6
|
Soapbox: increase default pool_size and timeout
|
2021-11-22 20:31:33 -06:00 |
|
Alex Gleason
|
ec024ff3fd
|
Downgrade hackney again
|
2021-11-22 12:42:57 -06:00 |
|
rinpatch
|
588bcbac55
|
Apply 2 suggestion(s) to 2 file(s)
|
2021-11-22 10:54:44 +00:00 |
|
Alex Gleason
|
9fc15b7310
|
Restore SetMeta upload filter for backwards compatibility
|
2021-11-21 13:38:57 -06:00 |
|
Alex Gleason
|
18d23c9acc
|
Merge tag 'v2.4.1' into pleroma-v2.4.0
|
2021-11-21 13:34:44 -06:00 |
|
Alex Gleason
|
7bcc60d740
|
Merge remote-tracking branch 'origin/develop' into pleroma-v2.4.0
|
2021-11-21 13:30:43 -06:00 |
|
|
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 18:17:06 +01:00 |
|
|
|
cb76faece9
|
Update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:51:00 +01:00 |
|
|
|
106b5c2678
|
Fix a typo
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:36:37 +01:00 |
|
|
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
Alibek Omarov
|
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 |
|
Alibek Omarov
|
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 |
|
lain
|
838da53ea7
|
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
|
2021-11-15 11:58:49 +00:00 |
|
lain
|
bd77243981
|
Merge branch 'userfeed-fe-fallback' into 'develop'
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
|
2021-11-15 10:48:56 +00:00 |
|
lain
|
d058e1c978
|
Merge branch 'fix-releases' into 'develop'
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
|
2021-11-14 20:35:10 +00:00 |
|
Lain Soykaf
|
5c7aa4a1e9
|
CI: Conservatively update release images so they keep building.
|
2021-11-14 20:37:32 +01:00 |
|
lain
|
0f8b10ff5a
|
Merge branch 'bugfix/inbox-misleading-warning' into 'develop'
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
See merge request pleroma/pleroma!3531
|
2021-11-14 16:14:09 +00:00 |
|
lain
|
eb0f7620f2
|
Merge branch 'update-crypt' into 'develop'
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
|
2021-11-14 16:00:01 +00:00 |
|
Lain Soykaf
|
7dcc73f294
|
Mix: Update crypt to fix musl builds.
|
2021-11-14 16:04:08 +01:00 |
|
