fedward/distraction.party
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
9053 commits 4 branches 73 tags 294 MiB
Commit graph

9053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController 2020-04-13 22:44:52 +04:00
rinpatch
ef37774403 Merge branch 'output-of-relationships-in-statuses' into 'develop' 
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications

See merge request pleroma/pleroma!2342
 2020-04-13 13:05:40 +00:00
Ivan Tashkinov
5c76afb06c [#2342] Removed description.exs entry for temporary configuration option. 2020-04-13 15:38:50 +03:00
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
Ivan Tashkinov
dc2637c188 [#2342] Removed changelog entry for temporary configuration option. 2020-04-13 09:16:35 +03:00
rinpatch
7ee35eb9a6 Merge branch 'fix/mix-tasks-failing-otp' into 'develop' 
Fix mix tasks failing on OTP releases

Closes #1678

See merge request pleroma/pleroma!2369
 2020-04-12 16:00:15 +00:00
rinpatch
2ba754ffe1 Fix mix tasks failing on OTP releases 
No idea why this was even added.
Closes #1678
 2020-04-12 18:49:31 +03:00
rinpatch
5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-04-11 19:46:04 +00:00
rinpatch
c682563b92 Merge branch 'support/update_oban' into 'develop' 
[#1555] updated the Oban package

See merge request pleroma/pleroma!2346
 2020-04-11 10:04:02 +00:00
Maksim Pechnikov
ad92cef844 fix Oban migration 2020-04-10 21:27:50 +03:00
Maksim Pechnikov
c255c2e4f5 Merge branch 'develop' into support/update_oban 2020-04-10 21:27:41 +03:00
feld
aae22ab691 Merge branch 'chore/changelog-organization' into 'develop' 
Add a section for changelog entries that pertain to the next patch release.

See merge request pleroma/pleroma!2366
 2020-04-10 16:56:41 +00:00
Mark Felder
6ff8812ea3 Add a section for changelog entries that pertain to the next patch release. 
This will make it easier to keep changelogs synced between develop and stable branches.
 2020-04-10 11:37:02 -05:00
Haelwenn
fc4f92c5de Merge branch 'fix/support-conversations-pagination' into 'develop' 
Support pagination in conversations

See merge request pleroma/pleroma!2329
 2020-04-10 12:12:49 +00:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04:00
Haelwenn
ce089615e1 Merge branch 'chore/fix-changelog' into 'develop' 
Chore/fix changelog

See merge request pleroma/pleroma!2364
 2020-04-10 05:15:11 +00:00
Haelwenn
4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop' 
bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316
 2020-04-10 04:31:13 +00:00
Maksim Pechnikov
648cc699e5 Merge branch 'develop' into support/update_oban 2020-04-10 07:09:28 +03:00
Haelwenn
c433ed9dbb Merge branch 'fix-otp-version-file-in-docker' into 'develop' 
Create OTP_VERSION file by `mix release`

See merge request pleroma/pleroma!2362
 2020-04-10 03:55:54 +00:00
kPherox
c2aad36aa8 Rename function 2020-04-09 23:19:41 +00:00
rinpatch
9abf13abe0 CHANGELOG.md: update 2.0.2 release date 2020-04-09 15:46:12 -05:00
rinpatch
adeb82e496 CHANGELOG.md: add 2.0.2 update notes 2020-04-09 15:45:41 -05:00
rinpatch
0b8f9a66ae CHANGELOG.md: add entries for funkwhale-related changes 2020-04-09 15:45:35 -05:00
rinpatch
7306d2d069 CHANGELOG.md: Add 2.0.2 entry 2020-04-09 15:45:25 -05:00
rinpatch
2a08f44b02 CHANGELOG.md: Add upgrade notes for 2.0.1 2020-04-09 15:43:54 -05:00
rinpatch
781ac28859 changelog.md: add 2.0.1 entry 2020-04-09 15:42:01 -05:00
rinpatch
fd388a0941 Merge branch 'update-changelog' into 'develop' 
Update CHANGELOG

See merge request pleroma/pleroma!2363
 2020-04-09 19:49:10 +00:00
Egor Kislitsyn
c826d5195f
Update CHANGELOG 2020-04-09 23:36:17 +04:00
feld
c23532d24b Merge branch 'notifications-dismiss-api' into 'develop' 
Add `/api/v1/notifications/:id/dismiss` endpoint

Closes #1673

See merge request pleroma/pleroma!2360
 2020-04-09 19:32:11 +00:00
kPherox
0e8f6d24b8
Create OTP_VERSION file by mix release 2020-04-10 00:22:50 +09:00
lain
e84c0450bf Merge branch 'fix-otp-version-file-in-docker' into 'develop' 
Add OTP_VERSION file to docker

Closes #1662

See merge request pleroma/pleroma!2361
 2020-04-09 14:12:08 +00:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04:00
kPherox
d37a102933
Fix OTP_VERSION file in docker 2020-04-09 21:16:29 +09:00
lain
b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' 
Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344
 2020-04-09 10:42:43 +00:00
Alexander Strizhakov
f20a19de85
typo fix 2020-04-09 13:28:54 +03:00
Alexander Strizhakov
9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:50 +00:00
Alexander Strizhakov
365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:44 +00:00
Alexander Strizhakov
1cf0d5ab0d Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex 2020-04-09 10:17:36 +00:00
Alexander Strizhakov
4c60fdcbb1 Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex 2020-04-09 10:17:31 +00:00
Alexander Strizhakov
c8bfbf511e Apply suggestion to docs/API/admin_api.md 2020-04-09 10:17:24 +00:00
lain
d2e21fbc96 Merge branch 'open-api' into 'develop' 
Add OpenAPI

Closes pleroma-meta#19

See merge request pleroma/pleroma!2345
 2020-04-09 09:48:56 +00:00
lain
564f3f01ca Merge branch 'formatter-html-safe' into 'develop' 
formatter.ex: Use Phoenix.HTML for mention/hashtag generation

See merge request pleroma/pleroma!2357
 2020-04-09 09:47:07 +00:00
Haelwenn
de592a6d33 Merge branch 'changelog-update' into 'develop' 
No changelog entry - bug fixed only in develop

See merge request pleroma/pleroma!2359
 2020-04-09 05:11:10 +00:00
Alexander Strizhakov
73134e248a
no changelog entry - bug fixed only in develop 2020-04-09 08:03:21 +03:00
Haelwenn
4cedecac45 Merge branch 'bugfix/objectid_validator' into 'develop' 
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}

See merge request pleroma/pleroma!2358
 2020-04-09 02:43:03 +00:00
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""} 2020-04-09 04:36:39 +02:00
rinpatch
d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation 
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
 2020-04-08 22:58:31 +03:00
feld
90cbf55236 Merge branch 'gun-pool-fix' into 'develop' 
Fix for gun connections pool

Closes #1669 and #1664

See merge request pleroma/pleroma!2356
 2020-04-08 17:13:54 +00:00
Alexander Strizhakov
5739c498c0
fix for gun connections pool 2020-04-08 18:46:01 +03:00
rinpatch
dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop' 
Use Pleroma.Formatter.linkify/2 instead

See merge request pleroma/pleroma!2352
 2020-04-07 11:41:10 +00:00