lain
|
41503b1673
|
Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
|
2020-06-04 15:16:10 +00:00 |
|
lain
|
00748e9650
|
ChatMessageReferences: Change seen -> unread
|
2020-06-04 17:14:42 +02:00 |
|
stwf
|
a42d135cce
|
test fix
|
2020-06-04 10:51:24 -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 |
|
lain
|
6e103a18af
|
Docs: Document WebPush changes.
|
2020-06-04 14:49:36 +02:00 |
|
lain
|
b952f3f379
|
WebPush: Push out chat message notications.
|
2020-06-04 14:49:10 +02:00 |
|
lain
|
5d7dda883e
|
SideEffectsTest: More tests.
|
2020-06-04 14:46:41 +02: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 |
|
stwf
|
75e886b506
|
fix config
|
2020-06-03 17:32:03 -04:00 |
|
stwf
|
906ac57ba8
|
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
# Conflicts:
# lib/pleroma/web/preload/status_net.ex
|
2020-06-03 17:25:53 -04:00 |
|
stwf
|
5677b21e82
|
clean up
|
2020-06-03 17:24:35 -04:00 |
|
stwf
|
3b8180d7d1
|
add status_net/config
|
2020-06-03 16:34:03 -04:00 |
|
stwf
|
dbcc1b105e
|
encode data properly
|
2020-06-03 16:34:03 -04:00 |
|
stwf
|
29ae5bb771
|
preload data into index.html
|
2020-06-03 16:34:03 -04:00 |
|
lain
|
e46aecda55
|
Notification: Fix notifications backfill for compacted activities
|
2020-06-03 20:51:59 +02:00 |
|
stwf
|
aa26dc6a13
|
add status_net/config
|
2020-06-03 13:40:48 -04:00 |
|
lain
|
e213e31577
|
Changelog: Add chats to changelog.
|
2020-06-03 19:25:57 +02:00 |
|
lain
|
286bd8eb83
|
Docs: Add `mark_message_as_read` to docs
|
2020-06-03 19:24:37 +02:00 |
|
lain
|
b3407344d3
|
ChatController: Add function to mark single message as read.
|
2020-06-03 19:21:23 +02: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 |
|
lain
|
c020fd4352
|
ChatMessageReferenceView: Return read status as `unread`.
|
2020-06-03 18:58:58 +02: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 |
|
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 |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
2020-06-02 18:50:37 +04:00 |
|
stwf
|
f73b2063f4
|
encode data properly
|
2020-06-02 10:18:06 -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 |