AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 25 Projects 2 Releases 14 Packages Wiki Activity
6147 commits 26 branches 107 tags 319 MiB
Commit graph

6147 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
8980c1c769 Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop' 
ostatus: explicitly disallow protocol downgrade from activitypub

See merge request pleroma/pleroma!1511
 2019-07-31 18:30:40 +00:00
Ariadne Conill
f72e0b7cad ostatus: explicitly disallow protocol downgrade from activitypub 
This closes embargoed bug #1135.
 2019-07-31 18:17:31 +00:00
rinpatch
301ea0dc04 Add tests for counters being updated on follow 2019-07-31 21:09:13 +03:00
kaniini
957de9d771 Merge branch 'test/twitter/util_controller' into 'develop' 
tests for TwitterApi/UtilController

See merge request pleroma/pleroma!1509
 2019-07-31 15:14:36 +00:00
Maksim
58443d0cd6 tests for TwitterApi/UtilController 2019-07-31 15:14:36 +00:00
rinpatch
f42719506c Fix credo issues 2019-07-31 14:20:34 +03:00
rinpatch
c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote 2019-07-31 14:12:29 +03:00
kaniini
373a7c6739 Merge branch 'admin-changes' into 'develop' 
Admin changes

See merge request pleroma/pleroma!1489
 2019-07-30 16:36:05 +00:00
Alexander Strizhakov
51b3b6d816 Admin changes 2019-07-30 16:36:05 +00:00
kaniini
677df5ceb3 Merge branch 'security/remote-follow-commonapi' into 'develop' 
twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

See merge request pleroma/pleroma!1506
 2019-07-29 20:10:59 +00:00
Ariadne Conill
3850812503 twitter api: utils: rework do_remote_follow() to use CommonAPI 
Closes #1138
 2019-07-29 20:00:57 +00:00
kaniini
6657506185 Merge branch 'revert-83508418' into 'develop' 
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505
 2019-07-29 19:42:35 +00:00
kaniini
5835069215 Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" 
This reverts merge request !1504
 2019-07-29 19:42:26 +00:00
Haelwenn
83508418fb Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop' 
markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504
 2019-07-29 19:24:14 +00:00
Ariadne Conill
5795a890e9 markdown: clean up html generated by earmark 2019-07-29 19:09:58 +00:00
lain
1dfde4151c Merge branch 'refactor/use-constants' into 'develop' 
refactoring: begin to use constants

See merge request pleroma/pleroma!1500
 2019-07-29 16:30:47 +00:00
kaniini
3b8cd27b05 Merge branch 'mailer-enabled-nodeinfo' into 'develop' 
Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502
 2019-07-29 16:17:41 +00:00
Eugenij
0bee2131ce Add mailerEnabled to the NodeInfo metadata 2019-07-29 16:17:40 +00:00
kaniini
8be0154094 Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop' 
Redirect not logged-in users to the MastoFE login page on private instances

Closes #1045

See merge request pleroma/pleroma!1503
 2019-07-29 16:17:23 +00:00
Sergey Suprunenko
c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances 2019-07-29 16:17:22 +00:00
kaniini
1f7c8d9615 Merge branch 'tests/ostatus_controller' into 'develop' 
added tests for OstatusController

See merge request pleroma/pleroma!1501
 2019-07-29 05:02:20 +00:00
Maksim
159bbec570 added tests for OstatusController 2019-07-29 05:02:20 +00:00
Ariadne Conill
b93498eb52 constants: add as_public constant and use it everywhere 2019-07-29 02:43:19 +00:00
Ariadne Conill
9d78b3b281 mix: add ex_const dependency 2019-07-29 02:12:35 +00:00
kaniini
b38d21060e Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' 
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

See merge request pleroma/pleroma!1498
 2019-07-28 21:40:55 +00:00
Ariadne Conill
492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users 
Closes #1104
 2019-07-28 21:32:04 +00:00
kaniini
44bfff22a7 Merge branch 'confirmation-resend' into 'develop' 
add account confirmation email resend in mastodon api

See merge request pleroma/pleroma!1492
 2019-07-28 20:30:10 +00:00
Sachin Joshi
242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
kaniini
0d05ec3855 Merge branch 'fix/user_update_and_set_cache' into 'develop' 
fixed User.update_and_set_cache for stale user

See merge request pleroma/pleroma!1493
 2019-07-28 20:29:27 +00:00
Maksim
6a4b8b2681 fixed User.update_and_set_cache for stale user 2019-07-28 20:29:26 +00:00
kaniini
488c06b6f5 Merge branch 'develop' into 'develop' 
Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496
 2019-07-28 20:25:35 +00:00
kaniini
f78390ffdf Merge branch 'feature/hackney-303-redirect' into 'develop' 
Handle 303 redirects

Closes #1127

See merge request pleroma/pleroma!1497
 2019-07-28 20:24:39 +00:00
Sergey Suprunenko
02dc651828 Handle 303 redirects 2019-07-28 20:24:39 +00:00
Thomas Sileo
961e778531 Fix HTTP sig tweak on KeyId 2019-07-28 14:17:56 +02:00
rinpatch
08960d5016 Merge branch 'issue/1097' into 'develop' 
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

See merge request pleroma/pleroma!1495
 2019-07-26 20:27:38 +00:00
Maksim
6b77a88365 [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ 2019-07-26 20:27:38 +00:00
Haelwenn
46e8b68093 Merge branch 'changelog/1484-base_url-remove-media' into 'develop' 
Changelog: !1484 base_url removed /media/

See merge request pleroma/pleroma!1494
 2019-07-26 15:27:12 +00:00
Haelwenn (lanodan) Monnier
7c8abbcb1c
CHANGELOG.md: Add entry for !1484 
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484

[ci skip]
 2019-07-26 17:26:37 +02:00
rinpatch
41e0304757 Merge branch 'develop' into feature/hide-follows-remote 2019-07-25 18:43:30 +03:00
kaniini
d1e891062e Merge branch 'tests/filter_dedupe' into 'develop' 
fixed test for elixir 1.7.4

See merge request pleroma/pleroma!1487
 2019-07-25 03:43:13 +00:00
Maksim
03c386614f fixed test for elixir 1.7.4 2019-07-25 03:43:13 +00:00
kaniini
19835be067 Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' 
Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472
 2019-07-24 19:29:01 +00:00
kaniini
931c4974ee Merge branch 'fix/put-correct-activity-url' into 'develop' 
Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request pleroma/pleroma!1485
 2019-07-24 19:28:21 +00:00
Sergey Suprunenko
b20020da16 Show the url advertised in the Activity in the Status JSON response 2019-07-24 19:28:21 +00:00
kPherox
8d9f43e1d1
Add WebFinger test for AP-only account 2019-07-25 01:27:34 +09:00
kaniini
acd20914ec Merge branch 'fix/Upload_base_url' into 'develop' 
Fix/upload base url

See merge request pleroma/pleroma!1484
 2019-07-24 15:35:25 +00:00
feld
84fca14c3c Do not prepend /media/ when using base_url 
This ensures admin has full control over the path where media resides.
 2019-07-24 15:35:25 +00:00
kPherox
ac27b94ffa
Change to not require magic-public-key on WebFinger 2019-07-25 00:21:32 +09:00
kaniini
7286cdff7a Merge branch 'tests/web_finger' into 'develop' 
tests WebFinger

See merge request pleroma/pleroma!1483
 2019-07-24 15:13:11 +00:00
Maksim
55341ac717 tests WebFinger 2019-07-24 15:13:10 +00:00