Commit graph

9626 commits

Author SHA1 Message Date
lain
8d5597ff68 ChatController: Add GET /chats/:id 2020-05-10 13:26:14 +02:00
lain
172d9b1193 Chat: Add last_message to schema. 2020-05-10 13:08:01 +02:00
lain
17be3ff669 Documentation: Add last_message to chat docs. 2020-05-10 13:01:20 +02:00
lain
f335e1404a ChatView: Add the last message to the view. 2020-05-10 13:00:01 +02:00
lain
e297d8c649 Documentation: Add attachment docs 2020-05-10 12:34:12 +02:00
lain
c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-10 12:32:57 +02:00
lain
1054e89762 ChatOperation: Add media id to example 2020-05-10 12:30:24 +02:00
lain
7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened

See merge request 
2020-05-10 09:05:22 +00:00
rinpatch
b3e6953d23 Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
insert skeletons migration: fix for non-local locals

Closes 

See merge request 
2020-05-09 21:52:00 +00:00
rinpatch
0ad89762a1 insert skeletons migration: fix for non-local locals
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.

In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx

Closes 
2020-05-09 22:07:35 +03:00
rinpatch
d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
PleromaFE bundle dropping requirement for embedded account relationships

See merge request 
2020-05-09 15:30:39 +00:00
rinpatch
5e1d994785 Merge branch 'fix/eldap-otp' into 'develop'
include eldap in OTP releases

Closes 

See merge request 
2020-05-09 12:18:44 +00:00
rinpatch
b6d1bcc55d include eldap in OTP releases
Closes 
2020-05-09 15:17:12 +03:00
lain
c962c6afb3 Merge branch 'fix/healthcheck-total-alloc' into 'develop'
healthcheck: report real amount of memory allocated by beam

See merge request 
2020-05-09 08:10:56 +00:00
rinpatch
30eaef9d61 healthcheck: report real amount of memory allocated by beam
as opposed to memory currently in use
2020-05-08 23:57:47 +03:00
rinpatch
df82ee4179 Merge branch 'chore/changelog-sync' into 'develop'
CHANGELOG.md: Add entries from 2.0.3

See merge request 
2020-05-08 20:56:16 +00:00
rinpatch
f4d50fbd81 CHANGELOG.md: Add entries from 2.0.3 2020-05-08 23:54:16 +03:00
3a014dd609 Merge branch 'chore/description-grammar' into 'develop'
Minor grammar nit

See merge request 
2020-05-08 19:48:39 +00:00
Mark Felder
c9344b5f2d Minor grammar nit 2020-05-08 14:36:59 -05:00
65299daa85 Merge branch 'fix/adminfe-icons' into 'develop'
Restore deleted icons. No idea how this happened.

See merge request 
2020-05-08 19:34:12 +00:00
Mark Felder
6a291b1834 Restore deleted icons. No idea how this happened. 2020-05-08 14:22:49 -05:00
Ivan Tashkinov
0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
2020-05-08 21:33:56 +03:00
lain
03529f6a05 Transmogrifier: Don't modify attachments for chats. 2020-05-08 18:26:35 +02:00
rinpatch
570940a3fd Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.

See merge request 
2020-05-08 15:00:43 +00:00
lain
d0bf8cfb8f Credo fixes. 2020-05-08 14:11:58 +02:00
lain
7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
lain
fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.

See merge request 
2020-05-08 10:41:41 +00:00
lain
7e9aaa0d02 Transmogrifier tests: Remove more double tests. 2020-05-08 11:43:07 +02:00
lain
f1274c3326 Transmogrifier tests: Remove double tests. 2020-05-08 11:41:13 +02:00
lain
6acbe45eb2 Builder: Extract common features of likes and reactions. 2020-05-08 11:30:31 +02:00
lain
0cf43391f2 Merge branch 'issue/1276-2' into 'develop'
[] added an endpoint for getting unread notification count

See merge request 
2020-05-08 09:23:01 +00:00
Maksim Pechnikov
a081135365 revert mix.lock 2020-05-08 12:06:24 +03:00
lain
218a22c9a3 Merge branch 'fix/privacy-notification' into 'develop'
Privacy option affects all push notifications, not just Direct Messages

Closes 

See merge request 
2020-05-08 09:04:24 +00:00
Maksim Pechnikov
b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
Haelwenn
769d95644d Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.

See merge request 
2020-05-07 22:29:16 +00:00
lain
ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 18:53:34 +02:00
rinpatch
bef08b85e5 Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline

See merge request 
2020-05-07 14:28:10 +00:00
Mark Felder
ea01e647df Test Direct, Public, and Favorite notifications with privacy option 2020-05-07 09:13:43 -05:00
lain
516ff945ce Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController

See merge request 
2020-05-07 13:38:34 +00:00
rinpatch
9f2bb22e15 Merge branch 'fix/streamer-wrong-arg-order' into 'develop'
Streamer: Fix wrong argument order when rendering activities to authenticated user

Closes 

See merge request 
2020-05-07 13:26:29 +00:00
rinpatch
eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes 
2020-05-07 16:13:24 +03:00
lain
d11eea62b1 Credo fixes 2020-05-07 15:09:37 +02:00
lain
fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
lain
7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 15:03:12 +02:00
lain
788b7e7bbd Merge fixes. 2020-05-07 14:52:37 +02:00
lain
cda410adfd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:35 +02:00
lain
f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:20 +02:00
rinpatch
b7635bf2b6 Merge branch 'fix/downgraded-deps' into 'develop'
Restore mix.lock after 2FA merge

See merge request 
2020-05-07 11:47:11 +00:00
rinpatch
9c3c142c32 Restore mix.lock after 2FA merge
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
2020-05-07 14:35:29 +03:00
lain
8ae4d64d47 Apply suggestion to lib/pleroma/notification.ex 2020-05-07 11:01:52 +00:00