lain
|
fb4ae9c720
|
Streamer, SideEffects: Stream out ChatMessageReferences
Saves us a few calles to fetch things from the DB that we already
have.
|
2020-06-03 16:45:04 +02: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
|
903955b189
|
FollowingRelationship: Remove meaningless change
|
2020-06-03 14:40:44 +02:00 |
|
lain
|
7b79871e97
|
Migrations: Add chat_id, seen index to ChatMessageReferences
This ensures fast count of unseen messages
|
2020-06-03 14:34:33 +02:00 |
|
lain
|
1e9efcf7c3
|
Migrations: Fix migration module name
|
2020-06-03 14:27:54 +02:00 |
|
lain
|
7f5c5b11a5
|
Chats: Remove unread from the db, calculate from unseen messages.
|
2020-06-03 14:26:50 +02: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 |
|
lain
|
8edead7c1d
|
Migration: Remove superfluous imports
|
2020-06-03 13:19:38 +02:00 |
|
lain
|
73127cff75
|
Credo fixes.
|
2020-06-03 13:17:29 +02:00 |
|
lain
|
6413e06a86
|
Migrations: Add unique index to ChatMessageReferences.
|
2020-06-03 13:13:44 +02:00 |
|
lain
|
2591745fc2
|
ChatMessageReferences: Move tests
|
2020-06-03 12:56:39 +02:00 |
|
Egor Kislitsyn
|
8a43611e01
|
Use AdminAPI.StatusView in api/admin/users
|
2020-06-03 14:53:46 +04:00 |
|
lain
|
f3ccd50a33
|
ChatMessageReferences: Adjust views
|
2020-06-03 12:49:53 +02:00 |
|
lain
|
aa22fce8f4
|
ChatMessageReference: Introduce and switch in chat controller.
|
2020-06-03 12:30:12 +02: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 |
|
Alibek Omarov
|
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 |
|
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
|
2c6ebe709a
|
Credo fixes
|
2020-06-02 15:14:52 +02:00 |
|
lain
|
6cd2fa2a4c
|
Migrations: Add a migration to backfill notification types.
|
2020-06-02 15:13:19 +02:00 |
|
lain
|
38dce485c4
|
Notification: Add function to backfill notification types
|
2020-06-02 14:50:10 +02:00 |
|
lain
|
904295d53b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-02 14:28:01 +02:00 |
|
lain
|
37542a9dfa
|
Activity: Remove notifications-related functions.
|
2020-06-02 14:22:16 +02:00 |
|
lain
|
127ccc4e1c
|
NotificationController: Don't return chat_mentions by default.
|
2020-06-02 14:05:53 +02: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 |
|
lain
|
805ab86933
|
Notifications: Make notifications save their type.
|
2020-06-02 13:24:34 +02: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 |
|
lain
|
8e1db6a835
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-02 10:43:13 +02: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
|
af9090238e
|
CommonAPI: Newlines -> br for chat messages.
|
2020-06-01 15:14:22 +02: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
|
8ff3425828
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-01 13:34:13 +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 |
|