|
|
ebbf2189ee
|
Merge branch 'chore/bump-changelog' into 'develop'
Add changelog entry for emoji pack reload command
See merge request pleroma/pleroma!2646
|
2020-06-12 13:55:13 +00:00 |
|
Mark Felder
|
c2048f75cd
|
Add changelog entry for emoji pack reload command
|
2020-06-12 08:42:23 -05:00 |
|
lain
|
1419c67f4d
|
Merge branch 'feature/cli-reload-emoji' into 'develop'
Add command to reload emoji packs from cli for OTP users
Closes #1814
See merge request pleroma/pleroma!2639
|
2020-06-12 13:32:59 +00:00 |
|
|
|
11aa02bb10
|
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'
[#1794] Fixes URI query handling for hashtags extraction in search
Closes #1794
See merge request pleroma/pleroma!2645
|
2020-06-12 12:31:27 +00:00 |
|
Ivan Tashkinov
|
2188097066
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
2020-06-12 14:25:41 +03:00 |
|
|
|
5474b5c988
|
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
|
2020-06-11 16:18:06 +00:00 |
|
Mark Felder
|
7f7a1a4676
|
Check for media proxy base_url, not Upload base_url
|
2020-06-11 11:05:22 -05:00 |
|
Mark Felder
|
8a59fde0e5
|
Merge branch 'develop' into fix/csp-mediaproxy-base-url
|
2020-06-11 10:25:00 -05:00 |
|
|
|
5d6ec6e5fc
|
Merge branch '1794-hashtags-construction-from-uri' into 'develop'
[#1794] Hashtags search fix for URI as query string
Closes #1794
See merge request pleroma/pleroma!2641
|
2020-06-11 14:04:51 +00:00 |
|
Ivan Tashkinov
|
b28cec4271
|
[#1794] Fixes URI query handling for hashtags extraction in search.
|
2020-06-11 16:05:14 +03:00 |
|
Mark Felder
|
7c47f791a8
|
Add command to reload emoji packs from cli for OTP users
Not useful for source releases as we don't have a way to automate connecting to the running instance.
|
2020-06-10 13:02:08 -05:00 |
|
rinpatch
|
99afc7f4e4
|
HTTP security plug: add media proxy base url host to csp
|
2020-06-10 20:09:16 +03:00 |
|
rinpatch
|
7aa6c82937
|
Merge branch 'remake-remodel-dms' into 'develop'
Chats / ChatMessages
See merge request pleroma/pleroma!2429
|
2020-06-10 12:05:45 +00:00 |
|
lain
|
1b746cfbbb
|
Merge branch 'add-url-to-admin-account-view' into 'develop'
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
|
2020-06-09 12:59:14 +00:00 |
|
Egor Kislitsyn
|
3dd1de61a7
|
Add url field to AdminAPI.AccountView
|
2020-06-09 16:02:42 +04:00 |
|
lain
|
064c4f86f3
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-09 09:36:07 +02:00 |
|
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 |
|
lain
|
40d5058cc4
|
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-09 09:21:44 +02:00 |
|
lain
|
e1bc37d118
|
MigrationHelper: Move notification backfilling to own module.
|
2020-06-09 09:20:55 +02:00 |
|
lain
|
fc04a138d4
|
Apply suggestion to lib/pleroma/notification.ex
|
2020-06-08 20:01:37 +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
|
3b5282bef2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-08 11:19:18 +02: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 |
|
lain
|
89b85f6529
|
ChatController: Remove nonsensical pagination.
|
2020-06-08 11:09:53 +02:00 |
|
lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-08 10:18:10 +02:00 |
|
lain
|
1a2acce7c5
|
Docs: Document new mandatory parameter.
|
2020-06-07 20:23:17 +02:00 |
|
lain
|
fe2a5d0614
|
ChatController: Make last_read_id mandatory.
|
2020-06-07 20:22:08 +02:00 |
|
Sergey Suprunenko
|
8d9e586887
|
Delete pending follow requests on user deletion
|
2020-06-07 17:31:37 +02:00 |
|
lain
|
680fa5fa36
|
Docs: Update docs on mark as read.
|
2020-06-07 15:41:46 +02:00 |
|
lain
|
801e668a97
|
ChatController: Add last_read_id option to mark_as_read.
|
2020-06-07 15:38:33 +02:00 |
|
lain
|
2cdaac4330
|
SideEffects: Move streaming of chats to after the transaction.
|
2020-06-07 14:52:56 +02:00 |
|
lain
|
1a11f0e453
|
Chats: Change id to flake id.
|
2020-06-07 14:25:30 +02:00 |
|
lain
|
0365053c8d
|
AttachmentValidator: Check if the mime type is valid.
|
2020-06-07 09:19:00 +02:00 |
|
lain
|
40fc4e974e
|
Notfication: Add validation of notification types
|
2020-06-06 16:59:08 +02:00 |
|
lain
|
f4cf4ae16e
|
ChatController: Use new oauth scope *:chats.
|
2020-06-06 16:48:02 +02:00 |
|
lain
|
f77d4a302d
|
Credo fixes.
|
2020-06-06 15:51:08 +02:00 |
|
lain
|
9189b489ee
|
Migrations: Move Notification migration code to helper
|
2020-06-06 15:33:02 +02:00 |
|
lain
|
9fa3f0b156
|
Notification: Change type of type to an enum.
|
2020-06-06 13:08:45 +02:00 |
|
lain
|
ca0e6e702b
|
ChatMessageReference -> Chat.MessageReference
|
2020-06-06 11:51:10 +02:00 |
|
lain
|
137adef6e0
|
ChatMessageReference: Use FlakeId.Ecto.Type
No need for compat because this is brand new.
|
2020-06-06 10:42:24 +02:00 |
|
lain
|
239d03499e
|
Chat: creation_cng -> changeset
Make our usage of this more uniform.
|
2020-06-06 10:38:45 +02:00 |
|
lain
|
c5e3f2454c
|
Docs: Unify parameters in examples.
|
2020-06-06 10:35:38 +02:00 |
|
lain
|
4e8c0eecd5
|
WebPush: Don't break on contentless chat messages.
|
2020-06-06 09:46:07 +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 |
|
lain
|
f24d2f714f
|
Credo fixes
|
2020-06-05 17:18:48 +02:00 |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-05 16:53:56 +02: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 |
|
