fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-01 14:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
7191 commits 26 branches 107 tags 316 MiB
Commit graph

7191 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch 9c64a25713 Merge branch 'config-changes' into 'develop' 
two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666
 2019-09-14 17:26:35 +00:00
sadposter c137545a84 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-14 17:40:40 +01:00
rinpatch 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop' 
Truncate remote user fields

See merge request pleroma/pleroma!1619
 2019-09-14 16:39:42 +00:00
Roman Chvanikov d7457c9165 Merge branch 'develop' into refactor/subscription 2019-09-14 18:29:51 +03:00
Ivan Tashkinov e127b9ab6d [#1149] Rewritten readme as config/description.exs. 2019-09-14 16:28:59 +03:00
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
#	mix.lock
 2019-09-14 16:11:44 +03:00
rinpatch 3ae448b592 Merge branch 'fix-tests' into 'develop' 
Fix `Activity.all_by_actor_and_id/2` test

See merge request pleroma/pleroma!1668
 2019-09-14 12:36:08 +00:00
Egor Kislitsyn b870ae08fd Fix Activity.all_by_actor_and_id/2 test 2019-09-14 19:31:20 +07:00
rinpatch 4264c4b7e5 Merge branch 'security/fav-reblog-access-control' into 'develop' 
Mastodon API: Respect post privacy in favourited/reblogged endpoints

See merge request pleroma/pleroma!1667
 2019-09-14 11:44:34 +00:00
rinpatch a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:50:08 +00:00
rinpatch 85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:46:35 +00:00
sadposter ab55e41626 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-14 00:20:56 +01:00
sadposter b4512ddb6f thing 2019-09-14 00:20:48 +01:00
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints 2019-09-14 01:50:15 +03:00
lain a9b78f55e3 Merge branch 'capture-test-errors' into 'develop' 
Capture test error messages where appropriate

See merge request pleroma/pleroma!1665
 2019-09-13 17:07:14 +00:00
lain 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop' 
Refactor `add_link_headers/7` -> `add_link_headers/3`

See merge request pleroma/pleroma!1636
 2019-09-13 17:06:38 +00:00
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking 2019-09-13 19:42:53 +03:00
rinpatch ac4a748fad Disallow NULLs in deliveries 2019-09-13 19:28:35 +03:00
Alex S 4da0da9aa4 don't track generated_config.md 2019-09-13 19:13:04 +03:00
Alex S c625fe6f09 config.md back 2019-09-13 19:03:39 +03:00
Alex S 69faec031d markdown generation to the new file 2019-09-13 19:02:42 +03:00
stwf 25a64a4aa0 Capture test error messages where appropriate 2019-09-13 11:46:41 -04:00
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
rinpatch 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 15:25:15 +00:00
sadposter f1e1ba71ce update tos 2019-09-13 16:23:28 +01:00
rinpatch 05f8a066a1 Apply suggestion to lib/pleroma/delivery.ex 2019-09-13 15:23:26 +00:00
rinpatch 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 15:23:03 +00:00
sadposter 8046440a16 update fe 2019-09-13 16:18:38 +01:00
lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop' 
Cleanup `Pleroma.Activity` and add more tests

See merge request pleroma/pleroma!1623
 2019-09-13 14:48:00 +00:00
sadposter cc5b65bd21 add lato 2019-09-13 15:27:51 +01:00
Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop' 
Add email change endpoint

Closes #1156

See merge request pleroma/pleroma!1580
 2019-09-13 12:46:16 +00:00
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop' 
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611
 2019-09-13 12:36:24 +00:00
Maksim Pechnikov bc3e8c033b fix formatting 2019-09-13 15:06:34 +03:00
Maksim Pechnikov ec5aaf5bd7 fix tests 2019-09-13 14:59:58 +03:00
rinpatch 3896a51b8a Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 10:09:56 +00:00
rinpatch 5170170483 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 10:09:46 +00:00
rinpatch fb96facc32 Remove unused functions and fix credo issues 2019-09-13 12:29:42 +03:00
rinpatch ce23529d91 Use delivery info when federating deletes 2019-09-13 11:38:17 +03:00
Egor Kislitsyn 7b5c81b391 Add a note about compatibility with Mastodon 2019-09-13 13:09:37 +07:00
Egor Kislitsyn 25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
Egor Kislitsyn 5bfbad13ad Add more tests for Pleroma.Activity 2019-09-13 12:49:52 +07:00
Egor Kislitsyn 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils 2019-09-13 12:44:59 +07:00
Maksim Pechnikov d8a178274b fix Activity.get_by_id 2019-09-13 07:12:34 +03:00
Maksim 58b17196fa Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-13 03:58:58 +00:00
Maksim Pechnikov 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-13 06:55:05 +03:00
kaniini 5ca643b80d Merge branch 'fix/admin-api-docs' into 'develop' 
Fix admin api docs for creating users

See merge request pleroma/pleroma!1660
 2019-09-13 03:31:16 +00:00
Angelina Filippova 528a88a686 Fix admin api docs for creating users 2019-09-13 03:31:16 +00:00
Haelwenn 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop' 
Fix double quotes in error logs

See merge request pleroma/pleroma!1656
 2019-09-12 20:21:56 +00:00
rinpatch b0e6058021 Parse http signature for request to objects/activities 2019-09-12 23:03:52 +03:00
Maksim Pechnikov 936951826e Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-12 22:15:43 +03:00