lain
|
674efb0ad2
|
Merge branch 'features/mediatype-mime-valid' into 'develop'
transmogrifier: MIME.valid?/1 for mediaType
See merge request pleroma/pleroma!2634
|
2020-06-09 07:32:43 +00:00 |
|
Haelwenn (lanodan) Monnier
|
fe1cb56fdc
|
transmogrifier: MIME.valid?/1 for mediaType
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
|
2020-06-08 21:04:30 +02:00 |
|
lain
|
d192492658
|
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
|
2020-06-08 11:07:01 +00:00 |
|
lain
|
c450b248cc
|
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
|
2020-06-08 10:54:43 +00:00 |
|
lain
|
a1aa9fa913
|
Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'
Use atoms as keys in `ActivityPub.fetch_*` options
See merge request pleroma/pleroma!2629
|
2020-06-08 09:11:55 +00:00 |
|
Sergey Suprunenko
|
8d9e586887
|
Delete pending follow requests on user deletion
|
2020-06-07 17:31:37 +02:00 |
|
Egor Kislitsyn
|
167812a3f2
|
Fix pagination
|
2020-06-05 23:18:29 +04:00 |
|
Egor Kislitsyn
|
b02df1803e
|
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
|
2020-06-05 23:15:10 +04:00 |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
2020-06-05 14:52:09 +00:00 |
|
Haelwenn
|
657e1583f8
|
Merge branch 'features/put_if_present' into 'develop'
Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map
See merge request pleroma/pleroma!2436
|
2020-06-05 14:48:02 +00:00 |
|
Haelwenn
|
54bae06b4f
|
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Unifies all the similar functions to one and simplify some blocks with it.
|
2020-06-05 14:48:02 +00:00 |
|
Egor Kislitsyn
|
317e2b8d61
|
Use atoms as keys in ActivityPub.fetch_* functions options
|
2020-06-04 21:36:26 +04:00 |
|
minibikini
|
b57e4ad1ab
|
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
2020-06-04 13:29:32 +00:00 |
|
lain
|
f5cb1f3616
|
Merge branch 'openapi/admin/config' into 'develop'
Add OpenAPI spec to AdminAPI.ConfigController
See merge request pleroma/pleroma!2606
|
2020-06-04 13:00:13 +00:00 |
|
Egor Kislitsyn
|
a8132690bd
|
Fix credo
|
2020-06-04 13:46:13 +04:00 |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-04 13:30:14 +04:00 |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
2020-06-04 13:28:00 +04:00 |
|
lain
|
d6693a9102
|
Merge branch 'openapi/admin/reports' into 'develop'
Add OpenAPI spec for AdminAPI.ReportController
See merge request pleroma/pleroma!2628
|
2020-06-03 17:00:59 +00:00 |
|
Egor Kislitsyn
|
c16315d055
|
Add OpenAPI spec for AdminAPI.ReportController
|
2020-06-03 19:17:05 +04:00 |
|
Egor Kislitsyn
|
9d572f2f66
|
Move report actions to AdminAPI.ReportController
|
2020-06-03 19:17:04 +04:00 |
|
Haelwenn
|
18b050dfd1
|
Merge branch 'openapi/update-admin-api/status' into 'develop'
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
|
2020-06-03 14:04:12 +00:00 |
|
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
|
2020-06-03 11:28:56 +00:00 |
|
Egor Kislitsyn
|
8a43611e01
|
Use AdminAPI.StatusView in api/admin/users
|
2020-06-03 14:53:46 +04:00 |
|
lain
|
12c2b3b831
|
Merge branch 'patch-3' into 'develop'
docs: clients.md: Add Husky
See merge request pleroma/pleroma!2626
|
2020-06-03 07:18:32 +00:00 |
|
|
|
030240ee8f
|
docs: clients.md: Add Husky
|
2020-06-03 04:36:09 +00:00 |
|
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
|
2020-06-02 16:30:03 +00:00 |
|
Egor Kislitsyn
|
7922e63825
|
Update OpenAPI spec for AdminAPI.StatusController
|
2020-06-02 19:08:09 +04:00 |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-02 18:50:37 +04:00 |
|
lain
|
879304dcd9
|
Merge branch 'replies-domain-block' into 'develop'
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
|
2020-06-02 14:14:23 +00:00 |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
2020-06-02 14:13:24 +00:00 |
|
lain
|
6977500ef7
|
Merge branch 'tagline' into 'develop'
Update default instance description
See merge request pleroma/pleroma!2600
|
2020-06-02 14:10:53 +00:00 |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
2020-06-02 14:10:21 +00:00 |
|
lain
|
2860c66e88
|
Merge branch 'feature/embeddable-posts' into 'develop'
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
|
2020-06-02 14:04:34 +00:00 |
|
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
|
2020-06-02 11:32:03 +00:00 |
|
rinpatch
|
165a4b2a69
|
Do not include activities of invisible users unless explicitly requested
Closes #1833
|
2020-06-02 13:34:12 +03:00 |
|
lain
|
2db7a0d6b6
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2623
|
2020-06-02 09:15:56 +00:00 |
|
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/
|
2020-06-02 08:49:35 +00:00 |
|
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
|
2020-06-02 08:49:24 +00:00 |
|
Alexander Strizhakov
|
19f468c5bc
|
replies filtering for blocked domains
|
2020-06-02 09:00:10 +03:00 |
|
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
|
2020-06-01 20:48:11 +00:00 |
|
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
|
2020-06-01 20:45:59 +00:00 |
|
Alexander Strizhakov
|
7e6ec778d9
|
exclude replies on blocked domains
|
2020-06-01 21:17:32 +03:00 |
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
2020-06-01 17:38:57 +04:00 |
|
lain
|
fa37bfff99
|
Merge branch 'default-to-hackney-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2619
|
2020-06-01 13:24:03 +00:00 |
|
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.
|
2020-06-01 13:35:39 +02:00 |
|
lain
|
d4d4b92f75
|
TimelineController: Only return Create in public timelines.
|
2020-06-01 13:17:56 +02:00 |
|
lain
|
9460983032
|
AccountController: Federate user account changes.
Hotfixy commit, will be moved to the pipeline.
|
2020-06-01 13:03:22 +02:00 |
|
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
|
2020-05-30 15:51:19 +00:00 |
|
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
|
2020-05-30 14:03:43 +00:00 |
|
Roman Chvanikov
|
b973d0b2f0
|
Fix config setting to not affect other tests
|
2020-05-30 16:47:09 +03:00 |
|
