stwf
dbcc1b105e
encode data properly
4 years ago
stwf
29ae5bb771
preload data into index.html
4 years ago
lain
d6693a9102
Merge branch 'openapi/admin/reports' into 'develop'
...
Add OpenAPI spec for AdminAPI.ReportController
See merge request pleroma/pleroma!2628
4 years ago
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
Haelwenn
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
4 years ago
lain
d28d88766b
Merge branch 'admin-api/account-view' into 'develop'
...
Use AdminAPI.StatusView in api/admin/users
Closes #1836
See merge request pleroma/pleroma!2627
4 years ago
Egor Kislitsyn
8a43611e01
Use AdminAPI.StatusView in api/admin/users
4 years ago
lain
12c2b3b831
Merge branch 'patch-3' into 'develop'
...
docs: clients.md: Add Husky
See merge request pleroma/pleroma!2626
4 years ago
Alibek Omarov
030240ee8f
docs: clients.md: Add Husky
4 years ago
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
4 years ago
Egor Kislitsyn
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
4 years ago
lain
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
4 years ago
lain
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
4 years ago
lain
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
4 years ago
lain
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
4 years ago
lain
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
4 years ago
lain
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
4 years ago
rinpatch
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
4 years ago
lain
2db7a0d6b6
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!2623
4 years ago
Fristi
81fb45a71b
Translated using Weblate (Dutch)
...
Currently translated at 29.2% (31 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
4 years ago
lain
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
4 years ago
Alexander Strizhakov
19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
4 years ago
rinpatch
d67b8a96c7
Merge branch 'only-creates-in-public-tl' into 'develop'
...
TimelineController: Only return `Create` in public timelines.
Closes #1833 and #1821
See merge request pleroma/pleroma!2618
4 years ago
Alexander Strizhakov
7e6ec778d9
exclude replies on blocked domains
4 years ago
Egor Kislitsyn
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
4 years ago
lain
fa37bfff99
Merge branch 'default-to-hackney-again' into 'develop'
...
Config: Default to Hackney again
See merge request pleroma/pleroma!2619
4 years ago
lain
ac31f687c0
Config: Default to Hackney again
...
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
4 years ago
lain
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
4 years ago
lain
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
4 years ago
Haelwenn
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
4 years ago
lain
beeeed5b58
Merge branch 'test/fix-config-setting-in-user-test' into 'develop'
...
Fix config setting to not affect other tests
See merge request pleroma/pleroma!2615
4 years ago
Roman Chvanikov
b973d0b2f0
Fix config setting to not affect other tests
4 years ago
rinpatch
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
4 years ago
lain
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
4 years ago
Steven Fuchs
6d4b80822b
Conversation pagination
4 years ago
Ivan Tashkinov
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
rinpatch
d23b3701d8
Merge branch 'bugfix/csp-unproxied' into 'develop'
...
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
4 years ago
rinpatch
32ba2b7f9f
Merge branch 'media-docs' into 'develop'
...
Docs: Attachement limitations in MastoAPI differences
See merge request pleroma/pleroma!2607
4 years ago
rinpatch
d2a1975e56
mix.lock: update hackney to 1.16.0
...
Closes #1612
4 years ago
rinpatch
109af93227
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
4 years ago
lain
f361264e1a
Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'
...
fix unused var warning in streamer test
See merge request pleroma/pleroma!2612
4 years ago
Roman Chvanikov
0a83af330b
fix unused var warning
4 years ago
rinpatch
660d49227b
Merge branch 'connect-src' into 'develop'
...
Add blob: to connect-src CSP, fixes #1827
Closes #1827
See merge request pleroma/pleroma!2608
4 years ago
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
Alex Gleason
d38f28870e
Add blob: to connect-src CSP
4 years ago
lain
219d2b3146
Merge branch 'fix-streaming' into 'develop'
...
Fix argument error in streamer
See merge request pleroma/pleroma!2609
4 years ago
feld
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
4 years ago