Commit graph

13942 commits

Author SHA1 Message Date
Alex Gleason
58577d89e0
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:06:10 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
Alex Gleason
f5b5c71979 Merge branch 'fix-lint' into 'develop'
Lint twitter_util_operation.ex

See merge request soapbox-pub/soapbox!64
2021-12-15 21:53:45 +00:00
Alex Gleason
a114b59a2c
Lint twitter_util_operation.ex 2021-12-15 16:53:07 -05:00
Alex Gleason
53c4a78ff5 Merge branch 'fix-delete-account' into 'develop'
Fix delete account

See merge request soapbox-pub/soapbox!62
2021-12-15 21:09:53 +00:00
Alex Gleason
b370fe3c6c
Merge remote-tracking branch 'pleroma/delete-account-fix' into fix-delete-account 2021-12-13 16:18:56 -05:00
Alex Gleason
407b0b9d0f
TwitterAPI: allow deleting one's own account with request body 2021-12-13 16:15:33 -05:00
Alex Gleason
c932267089 Merge branch 'fix-dos' into 'develop'
Search: limit number of results (prevent DoS)

Closes #52

See merge request soapbox-pub/soapbox!61
2021-12-13 05:06:46 +00:00
Alex Gleason
fba92a7128
Merge remote-tracking branch 'pleroma/fix-search-dos' into fix-dos 2021-12-12 22:53:13 -06:00
Alex Gleason
108dfd1f87
Search: limit number of results 2021-12-12 22:50:07 -06:00
Alex Gleason
7a67c776ae Merge branch 'upgrade-hackney' into 'develop'
Upgrade hackney to v1.18

See merge request soapbox-pub/soapbox!60
2021-12-12 15:23:35 +00:00
Alex Gleason
e4f1f1012f
Merge remote-tracking branch 'origin/develop' into upgrade-hackney 2021-12-08 09:54:57 -06:00
Alex Gleason
0ec277b93c Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions

Closes #50

See merge request soapbox-pub/soapbox!59
2021-12-08 15:54:47 +00:00
Alex Gleason
7456e76c4d
Upgrade hackney to v1.18 2021-12-07 13:47:48 -05:00
Alex Gleason
91d00f9fe5
Merge remote-tracking branch 'pleroma/fix-attachment-dimensions' into fix-attachment-dimensions 2021-12-07 13:36:02 -05:00
Alex Gleason
335684182a
Fix VideoHandlingTest 2021-12-07 13:35:34 -05:00
Alex Gleason
092d9e9594
Merge remote-tracking branch 'pleroma/fix-attachment-dimensions' into fix-attachment-dimensions 2021-12-07 13:02:48 -05:00
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height 2021-12-07 12:59:03 -05:00
Alex Gleason
d9349bc52f
Transmogrifier: test fix_attachments/1 2021-12-07 01:10:47 -05:00
Alex Gleason
c348389cc0 Merge branch 'benchmark' into 'develop'
Fix benchmark

See merge request soapbox-pub/soapbox!58
2021-12-05 22:19:08 +00:00
Alex Gleason
cebd707ac0
Merge remote-tracking branch 'pleroma/benchmark' into benchmark 2021-12-05 17:05:16 -05:00
Alex Gleason
ce4560c2a1
Fix benchmarks 2021-12-03 16:20:54 -05:00
Alex Gleason
00c84be324 Merge branch 'v2-suggestions' into 'develop'
V2 suggestions

See merge request soapbox-pub/soapbox!57
2021-12-03 16:58:44 +00:00
Alex Gleason
34089e24d5
Merge remote-tracking branch 'pleroma/v2-suggestions' into v2-suggestions 2021-11-26 23:10:27 -06:00
Alex Gleason
6519f59d91
v2 Suggestions: return is_suggested through the API 2021-11-26 23:10:01 -06:00
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
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
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
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