knova/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
6483 commits 9 branches 75 tags 292 MiB
Commit graph

6483 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
rinpatch
b18234e04c Merge branch 'patch-3' into 'develop' 
Return profile URL when available instead of actor URI for MastodonAPI mention URL

Closes #1165

See merge request pleroma/pleroma!1541
 2019-08-07 22:14:02 +00:00
Thibaut Girka
9c0da1009a Return profile URL in MastodonAPI's url field 2019-08-07 21:40:53 +00:00
Thibaut Girka
089d53a961 Simplify logic to mention.js url field 
`User.profile_url` already fallbacks to ap_id
 2019-08-07 20:55:37 +00:00
Thibaut Girka
a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL 
Fixes #1165
 2019-08-07 20:29:30 +00:00
Haelwenn
aa718ab8f6 Merge branch 'fix/object-reembeds' into 'develop' 
Do not rembed the object after updating it

Closes #1142

See merge request pleroma/pleroma!1538
 2019-08-06 22:14:00 +00:00
rinpatch
4f1b9c54b9 Do not rembed the object after updating it 2019-08-07 01:02:29 +03:00
rinpatch
5329e84d62 OStatus tests: stop relying on embedded objects 2019-08-07 00:58:48 +03:00
rinpatch
32018a4ee0 ActivityPub tests: remove assertions of embedded object being updated, 
because the objects are no longer supposed to be embedded
 2019-08-07 00:36:13 +03:00
rinpatch
03ad31328c OStatus Announce Representer: Do not depend on the object being embedded 
in the Create activity
 2019-08-07 00:23:58 +03:00
rinpatch
73d8d5c49f Stop depending on the embedded object in restrict_favorited_by 2019-08-07 00:12:42 +03:00
kaniini
dea3bd02ce Merge branch 'issue/1150' into 'develop' 
[#1150] fixed parser TwitterCard

See merge request pleroma/pleroma!1537
 2019-08-06 20:19:28 +00:00
Maksim
139b196bc0 [#1150] fixed parser TwitterCard 2019-08-06 20:19:28 +00:00
lain
e4a01d253e Conversation: Rename function to better express what it does. 2019-08-06 15:06:19 +02:00
lain
a49c92f6ae Participation: Setting recipients will always add the owner. 2019-08-06 14:51:17 +02:00
kaniini
486b474327 Merge branch 'test/common_api_utils.ex' into 'develop' 
tests for CommonApi/Utils

See merge request pleroma/pleroma!1534
 2019-08-05 15:37:05 +00:00
Maksim
bdc9a7222c tests for CommonApi/Utils 2019-08-05 15:37:05 +00:00
lain
d6fe220e32 Linting. 2019-08-05 16:11:23 +02:00
lain
ddabe7784b Pleroma Conversations: Document differences. 2019-08-05 15:58:14 +02:00
lain
b64b6fee2a CommonAPI: Replies to conversations also get the correct context id. 2019-08-05 15:33:22 +02:00
lain
3af6d14da7 Pleroma Conversations API: Add a way to set recipients. 2019-08-05 15:09:19 +02:00
Egor Kislitsyn
bbd9ed0257 Update CHANGELOG 2019-08-05 15:33:34 +07:00
kaniini
fd60fd4713 Merge branch 'report-email-from-remote-user' into 'develop' 
Remove Reply-To from report emails

Closes #1141

See merge request pleroma/pleroma!1531
 2019-08-04 22:24:50 +00:00
Eugenij
96028cd585 Remove Reply-To from report emails 2019-08-04 22:24:50 +00:00
kaniini
f7fc902c29 Merge branch 'feature/relay-list-task' into 'develop' 
tasks: relay: add list task

Closes #1101

See merge request pleroma/pleroma!1528
 2019-08-04 17:14:37 +00:00
kaniini
bedabf7db2 Merge branch 'fix/wrong-next-key-likes-json' into 'develop' 
Do not add the "next" key to likes.json if there is no more items

See merge request pleroma/pleroma!1530
 2019-08-04 17:13:06 +00:00
Sergey Suprunenko
e8ad116c2a Do not add the "next" key to likes.json if there is no more items 2019-08-04 17:13:06 +00:00
kaniini
9e7c633b39 Merge branch 'patch-2' into 'develop' 
Replace "impode" with "implode"

See merge request pleroma/pleroma!1532
 2019-08-04 17:05:17 +00:00
x0rz3q
3411f506b3 Replace "impode" with "implode" for 2019-08-04 14:35:45 +00:00
kaniini
cee0d35566 Merge branch 'remove-longfox-emoji-set' into 'develop' 
Remove longfox emoji set

See merge request pleroma/pleroma!1525
 2019-08-04 04:32:45 +00:00
Hakaba Hitoyo
39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
kaniini
b9497ead35 Merge branch 'develop' into 'develop' 
Fix a stale link and a few typos

See merge request pleroma/pleroma!1529
 2019-08-04 04:32:09 +00:00
Pierce McGoran
9b9453ceaf Fix some typos and rework a few lines in howto_mediaproxy.md 2019-08-04 03:12:38 +00:00
Pierce McGoran
c10a3e035b Update link in README.md 2019-08-04 03:01:21 +00:00
Ariadne Conill
cef3af5536 tasks: relay: add list task 2019-08-03 23:17:17 +00:00
kaniini
b1fb5b93ae Merge branch 'bugfix/password-reset-link-styling' into 'develop' 
templates/layout/app.html.eex: Style anchors

See merge request pleroma/pleroma!1527
 2019-08-03 21:29:39 +00:00
Haelwenn (lanodan) Monnier
a035ab8c1d
templates/layout/app.html.eex: Style anchors 
[ci skip]
 2019-08-03 23:18:22 +02:00
kaniini
86fffe9c27 Merge branch 'patch-2' into 'develop' 
Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526
 2019-08-03 18:55:09 +00:00
Thibaut Girka
1fce56c7df Refactor 2019-08-03 18:37:20 +00:00
Thibaut Girka
16cfb89240 Only add preferredUsername to service actor json when the underlying user actually has a username 2019-08-03 18:28:08 +00:00
kaniini
4ae0a6652f Merge branch 'admin-fixes' into 'develop' 
Admin fixes

See merge request pleroma/pleroma!1524
 2019-08-03 18:16:09 +00:00
Alexander Strizhakov
de0f3b73dd Admin fixes 2019-08-03 18:16:09 +00:00
kaniini
99ce6d6044 Merge branch 'fix/search-space-error' into 'develop' 
Remove spaces from the domain search

Closes #1154

See merge request pleroma/pleroma!1521
 2019-08-03 18:13:21 +00:00
Sergey Suprunenko
040347b248 Remove spaces from the domain search 2019-08-03 18:13:20 +00:00
kaniini
7319b41e34 Merge branch 'fix/with-reject-nil-clause' into 'develop' 
Handle MRF rejections of incoming AP activities

Closes #1095

See merge request pleroma/pleroma!1520
 2019-08-03 18:12:39 +00:00
Sergey Suprunenko
8b2fa31fed Handle MRF rejections of incoming AP activities 2019-08-03 18:12:38 +00:00
kaniini
ba72d02f86 Merge branch 'official-docker-support' into 'develop' 
Add Dockerfile

See merge request pleroma/pleroma!1523
 2019-08-03 18:12:03 +00:00
Ashlynn Anderson
4007717534 Run mix format 2019-08-03 13:42:57 -04:00
Thibaut Girka
a187dbb326 Add preferredUsername to service actors so Mastodon can resolve them 2019-08-03 17:24:57 +00:00