ec72cba43e
Chat Controller: Add basic error handling.
4 years ago
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
b5aa204eb8
ChatController: Support deletion of chat messages.
4 years ago
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
4 years ago
2ead4e108a
Merge branch 'migration-fix-markers' into 'develop'
...
Markers migration: Fix migration for very large list of markers
See merge request pleroma/pleroma!2511
4 years ago
9b33cab06e
Merge branch 'chore/gettext-update' into 'develop'
...
Gettext: remove english messages and update the pot file
See merge request pleroma/pleroma!2512
4 years ago
952c6b29a1
Gettext: remove english messages and update the pot file
...
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
4 years ago
f6aa0b4a07
Migration: Fix typo
4 years ago
f71376e30e
Migration: Enum.chunk is deprecated.
4 years ago
d8dd945a03
Markers migration: Fix migration for very large list of markers
4 years ago
768c18facb
Merge branch 'fix/streamer-timeout' into 'develop'
...
Fix streamer timeout
Closes #1735 and #1753
See merge request pleroma/pleroma!2509
4 years ago
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
4 years ago
e432314105
Merge branch '1439-favorite-deletion' into 'develop'
...
SideEffects test: Add test for favorite deletion.
Closes #1439
See merge request pleroma/pleroma!2508
4 years ago
679afb2de4
SideEffects test: Add test for favorite deletion.
4 years ago
79cd723a1e
Merge branch '1204-object-pruning-deletion' into 'develop'
...
Deletion: Handle the case of pruned objects.
Closes #1204
See merge request pleroma/pleroma!2507
4 years ago
5367a00257
Deletion: Handle the case of pruned objects.
4 years ago
fdb98715b8
Chat: Fix wrong query.
4 years ago
84bb116ae3
Merge branch 'descriptions-fix' into 'develop'
...
copy/paste fix for descriptions
See merge request pleroma/pleroma!2504
4 years ago
da6a38d205
copy/paste fix for descriptions
4 years ago
1b1dfb54eb
Credo fixes.
4 years ago
8cc8d960af
Documentation: Add GET /chats/:id
4 years ago
8d5597ff68
ChatController: Add GET /chats/:id
4 years ago
172d9b1193
Chat: Add last_message to schema.
4 years ago
17be3ff669
Documentation: Add last_message to chat docs.
4 years ago
f335e1404a
ChatView: Add the last message to the view.
4 years ago
e297d8c649
Documentation: Add attachment docs
4 years ago
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
1054e89762
ChatOperation: Add media id to example
4 years ago
7ca83e71a9
Merge branch 'shortening-modules-name' into 'develop'
...
Descriptions that module names are shortened
See merge request pleroma/pleroma!2428
4 years ago
b3e6953d23
Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
...
insert skeletons migration: fix for non-local locals
Closes #1746
See merge request pleroma/pleroma!2502
4 years ago
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 #1746
4 years ago
d73e8b6b12
Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
...
PleromaFE bundle dropping requirement for embedded account relationships
See merge request pleroma/pleroma!2494
4 years ago
5e1d994785
Merge branch 'fix/eldap-otp' into 'develop'
...
include eldap in OTP releases
Closes #1313
See merge request pleroma/pleroma!2501
4 years ago
b6d1bcc55d
include eldap in OTP releases
...
Closes #1313
4 years ago
c962c6afb3
Merge branch 'fix/healthcheck-total-alloc' into 'develop'
...
healthcheck: report real amount of memory allocated by beam
See merge request pleroma/pleroma!2499
4 years ago
30eaef9d61
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
4 years ago
df82ee4179
Merge branch 'chore/changelog-sync' into 'develop'
...
CHANGELOG.md: Add entries from 2.0.3
See merge request pleroma/pleroma!2498
4 years ago
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
4 years ago
3a014dd609
Merge branch 'chore/description-grammar' into 'develop'
...
Minor grammar nit
See merge request pleroma/pleroma!2496
4 years ago
c9344b5f2d
Minor grammar nit
4 years ago
65299daa85
Merge branch 'fix/adminfe-icons' into 'develop'
...
Restore deleted icons. No idea how this happened.
See merge request pleroma/pleroma!2495
4 years ago
6a291b1834
Restore deleted icons. No idea how this happened.
4 years ago
0e1bda55e8
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
...
7a0e554daf
4 years ago
03529f6a05
Transmogrifier: Don't modify attachments for chats.
4 years ago
570940a3fd
Merge branch 'bugfix/fix-like-notifications' into 'develop'
...
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
4 years ago
d0bf8cfb8f
Credo fixes.
4 years ago
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
4 years ago
7e9aaa0d02
Transmogrifier tests: Remove more double tests.
4 years ago
lain