fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-28 19:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
6568 commits 27 branches 108 tags 316 MiB
Commit graph

6568 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop' 
added prepare html for RichMedia.Parser

See merge request pleroma/pleroma!1672
 2019-09-16 07:37:54 +00:00
kaniini 74eba5afe2 Merge branch 'fix/race-in-tests' into 'develop' 
Fix a race condition in tests

See merge request pleroma/pleroma!1673
 2019-09-16 07:36:57 +00:00
Egor Kislitsyn ca88e37a8f Fix a race condition in tests 2019-09-16 12:55:05 +07:00
rinpatch 2990c0a53b Merge branch '1149-oban-job-queue' into 'develop' 
[#1149] `oban`-based job & retry queues

Closes #1149

See merge request pleroma/pleroma!1518
 2019-09-15 20:22:17 +00:00
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser 2019-09-15 14:53:58 +03:00
Ivan Tashkinov 3b8ec98b0e [#1149] Reinstated docs/config.md changes. 2019-09-15 10:15:57 +03:00
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
 2019-09-15 10:12:24 +03:00
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
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
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
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
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
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
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
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
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
Mark Felder 102eb4455c Fix associated test as well 2019-09-12 12:29:08 -05:00
Mark Felder 74e4c72c4a Fix double quotes in error logs 
Example:

pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
 2019-09-11 16:16:09 -05:00
kaniini 50269e9cac Merge branch 'feature/jason-view-render' into 'develop' 
Use Jason for rendering responses

See merge request pleroma/pleroma!1655
 2019-09-11 20:47:25 +00:00
rinpatch 56828abf6d Use Jason for rendering responses 
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))
 2019-09-11 23:06:31 +03:00
Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop' 
Mastodon API: URI encode hashtag name in generated URLs

See merge request pleroma/pleroma!1642
 2019-09-11 17:47:19 +00:00
lain fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop' 
Revert "Parallelize template rendering"

See merge request pleroma/pleroma!1654
 2019-09-11 11:21:03 +00:00
rinpatch 5a76d5d239 Add extended benchmark 2019-09-11 11:13:17 +03:00
Alex S e47089cf55 web_cache_ttl description 2019-09-11 09:32:58 +03:00
Alex S 38b29779c3 refactoring 2019-09-11 09:25:33 +03:00
Alex S be32d90a0c little refactor 2019-09-11 09:25:33 +03:00
Alex S 5ff12e7df1 some changes 2019-09-11 09:25:33 +03:00
Alex S aa7fb22008 placeholder for config.md 2019-09-11 09:25:33 +03:00
Alex S 57dc59d98d little fix 2019-09-11 09:25:33 +03:00
Alex S 6b0e8b73df bump ex_doc version 2019-09-11 09:25:33 +03:00
Alex S 10827eecad formatting 2019-09-11 09:25:33 +03:00
Alex S 35757b6d0e don't add behaviour to suggestions 2019-09-11 09:25:33 +03:00
Alexander Strizhakov 5db2920644 Apply suggestion to config/description.exs 2019-09-11 09:25:33 +03:00