lain
8cc8d960af
Documentation: Add GET /chats/:id
2020-05-10 13:27:40 +02:00
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 pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
Ivan Tashkinov
b960a9430d
[ #2456 ] credo fix.
2020-05-10 09:35:12 +03:00
Ivan Tashkinov
b0d0d8f91b
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-10 09:17:16 +03:00
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
Roman Chvanikov
f3f8ed9e19
Set sum types in query
2020-05-10 09:13:24 +03:00
rinpatch
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
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 #1746
2020-05-09 22:07:35 +03:00
Ivan Tashkinov
ac4250a18c
[ #2456 ] Clarified skip_relationships option (and its default of false) for MastodonAPI.AccountView.
2020-05-09 19:03:07 +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 pleroma/pleroma!2494
2020-05-09 15:30:39 +00:00
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
2020-05-09 18:05:44 +03:00
rinpatch
5e1d994785
Merge branch 'fix/eldap-otp' into 'develop'
...
include eldap in OTP releases
Closes #1313
See merge request pleroma/pleroma!2501
2020-05-09 12:18:44 +00:00
rinpatch
b6d1bcc55d
include eldap in OTP releases
...
Closes #1313
2020-05-09 15:17:12 +03:00
Roman Chvanikov
4c19702390
Add docs
2020-05-09 14:32:08 +03:00
Roman Chvanikov
56819f7f06
Use index on refresh_counter_cache
2020-05-09 13:13:26 +03:00
Roman Chvanikov
4f26539717
Fix credo warning
2020-05-09 11:59:49 +03:00
Roman Chvanikov
5c368b004b
Fix refresh_counter_cache test
2020-05-09 11:49:54 +03:00
Roman Chvanikov
01b06d6dbf
Show progress in refresh_counter_cache task
2020-05-09 11:43:31 +03:00
Roman Chvanikov
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
Roman Chvanikov
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
lain
c962c6afb3
Merge branch 'fix/healthcheck-total-alloc' into 'develop'
...
healthcheck: report real amount of memory allocated by beam
See merge request pleroma/pleroma!2499
2020-05-09 08:10:56 +00:00
Roman Chvanikov
39d2f2118a
update counter_cache logic
2020-05-09 01:20:50 +03: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 pleroma/pleroma!2498
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
feld
3a014dd609
Merge branch 'chore/description-grammar' into 'develop'
...
Minor grammar nit
See merge request pleroma/pleroma!2496
2020-05-08 19:48:39 +00:00
Mark Felder
c9344b5f2d
Minor grammar nit
2020-05-08 14:36:59 -05:00
feld
65299daa85
Merge branch 'fix/adminfe-icons' into 'develop'
...
Restore deleted icons. No idea how this happened.
See merge request pleroma/pleroma!2495
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
Roman Chvanikov
0c2b09a9ba
Add migration for counter_cache table update
2020-05-08 22:08:11 +03:00
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03: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 pleroma/pleroma!2486
2020-05-08 15:00:43 +00:00
Alexander Strizhakov
287f781808
user deletion
2020-05-08 17:11:17 +03: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 pleroma/pleroma!2473
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
Maksim Pechnikov
4d71c4b805
fixed 'source' object in verify_credentials
2020-05-08 12:35:34 +03: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'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
2020-05-08 09:23:01 +00:00
