kawen/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7648 commits 12 branches 64 tags 298 MiB
Commit graph

7648 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roman Chvanikov
cf72b7649e Add migration 2019-10-26 22:54:37 +03:00
Roman Chvanikov
a4cf664385 Add migration 2019-10-26 22:53:41 +03:00
Roman Chvanikov
776c31267f Add migration 2019-10-26 22:52:49 +03:00
Roman Chvanikov
c0b0fb19c8 Add migration 2019-10-26 22:50:52 +03:00
Roman Chvanikov
5fece5f8bc Put correct migration 2019-10-26 22:49:37 +03:00
Roman Chvanikov
d58cca5f0a Add migration 2019-10-26 22:46:09 +03:00
Roman Chvanikov
cf0fa124a2 Add migration 2019-10-26 22:45:24 +03:00
Roman Chvanikov
13cc52dc60 Add migration 2019-10-26 22:44:42 +03:00
Roman Chvanikov
55203c198b Add migration 2019-10-26 22:43:32 +03:00
Roman Chvanikov
b85bee32da Add migration 2019-10-26 22:42:24 +03:00
Roman Chvanikov
b33aacc4fb Add migration 2019-10-26 22:40:51 +03:00
Roman Chvanikov
382e83fab5 Add migration 2019-10-26 22:39:24 +03:00
Roman Chvanikov
0223dc4e02 Add migration 2019-10-26 22:38:07 +03:00
Roman Chvanikov
d12555a69e Add migration 2019-10-26 22:37:30 +03:00
Roman Chvanikov
7ac42fefe3 Add migration 2019-10-26 22:36:43 +03:00
Roman Chvanikov
c1ff8472fd Add migration 2019-10-26 22:33:18 +03:00
Roman Chvanikov
5cb03fe801 Add migration 2019-10-26 22:32:31 +03:00
Roman Chvanikov
cd0218c205 Add migration 2019-10-26 22:31:25 +03:00
Roman Chvanikov
6e7fd364a4 Add migration 2019-10-26 22:28:18 +03:00
kaniini
beee3e75a8 Merge branch 'conversation-read-status-for-blocking-user' into 'develop' 
Count only visible conversations in the user's unread_conversation_count

See merge request pleroma/pleroma!1886
 2019-10-26 10:37:27 +00:00
rinpatch
12ab7b3280 User info migration improvements 
- Move column additions into a separate migration, so postgres doesn't
need an exclusive lock on the table for the main part
- Fill in columns by using one big update statement instead of a bunch
of small ones because it's much faster (the migration took 140s on
patch.cx database)
 2019-10-26 03:45:24 +03:00
eugenijm
0580654485 Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count. 
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
 2019-10-26 02:29:18 +03:00
rinpatch
653054d301 Merge branch 'remove-unsed-info-fields-fn' into 'develop' 
Remove unused Pleroma.User.info_fields/0

See merge request pleroma/pleroma!1882
 2019-10-25 14:51:02 +00:00
Egor Kislitsyn
dbee53c2df
Remove unused Pleroma.User.info_fields/0 2019-10-25 16:48:01 +07:00
kaniini
96cd66ac1b Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop' 
pleroma_ctl: fix crashes due to different shift(1) behavior on dash

See merge request pleroma/pleroma!1880
 2019-10-25 00:24:01 +00:00
kaniini
40a2a92a1f Merge branch 'object-fetch-errors' into 'develop' 
Object fetch errors

See merge request pleroma/pleroma!1881
 2019-10-25 00:22:50 +00:00
rinpatch
f3451e723b pleroma_ctl: fix crashes due to different shift(1) behavior on dash 2019-10-24 23:28:59 +03:00
stwf
5329b361ec fix test 2019-10-24 12:48:17 -04:00
stwf
2ab072f949 object fetcher error handling 2019-10-24 12:08:34 -04:00
kaniini
07a6f8b8a3 Merge branch 'fix/readme' into 'develop' 
fix link on docs-develop.pleroma.social

See merge request pleroma/pleroma!1876
 2019-10-24 08:34:35 +00:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maksim Pechnikov
a57f0dbd42 fix link on docs-develop.pleroma.social 2019-10-24 09:58:37 +03:00
Maxim Filippov
b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
feld
17c237ba80 Merge branch '1304-user-info-deprecation' into 'develop' 
[#1304] User.Info deprecation

Closes #1304

See merge request pleroma/pleroma!1851
 2019-10-23 17:34:42 +00:00
Ivan Tashkinov
c0246309a5 [#1304] Extra bullet-proofing. 2019-10-23 19:30:02 +03:00
Ivan Tashkinov
065e9fac12 [#1304] Adjusted User.Info references from Notification. 2019-10-23 17:31:02 +03:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/notification.ex
 2019-10-23 17:22:42 +03:00
Ivan Tashkinov
11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration. 2019-10-23 17:15:48 +03:00
kaniini
54077677ea Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop' 
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors

Closes #1326

See merge request pleroma/pleroma!1874
 2019-10-23 02:25:08 +00:00
Ariadne Conill
3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -05:00
kaniini
894fb806e9 Merge branch 'chore/add-single-value-deserialization-tests' into 'develop' 
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery

See merge request pleroma/pleroma!1873
 2019-10-23 00:47:28 +00:00
Ariadne Conill
277aea45b9 tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization 
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD.  It can, and we will add regression tests to prove that it can handle
this particular sin.  Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
 2019-10-22 19:43:31 -05:00
kaniini
6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop' 
Direct messages should provide a distinct push notification subject

See merge request pleroma/pleroma!1864
 2019-10-21 23:50:01 +00:00
Mark Felder
0c628fafc5 Spelling 2019-10-21 18:35:43 -05:00
Mark Felder
2cbb3f2364 Add tests for the subject of push notifications 2019-10-21 18:34:20 -05:00
rinpatch
6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' 
Do not include notifications from blocked users when with_muted is set

See merge request pleroma/pleroma!1869
 2019-10-21 16:44:17 +00:00
rinpatch
2dbee29cf5 Do not include notifications from blocked users when with_muted is set 
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
 2019-10-21 19:27:38 +03:00
kaniini
ce750dbab5 Merge branch 'feature/masto_api_markers' into 'develop' 
[#1275] Markers /api/v1/markers

See merge request pleroma/pleroma!1852
 2019-10-21 09:26:17 +00:00
Ivan Tashkinov
7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Egor Kislitsyn
478f0883eb
Fix benchmarks 2019-10-21 15:55:28 +07:00