fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
7970 commits 26 branches 107 tags 316 MiB
Commit graph

7970 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 7518f3877f Update changelog 2020-01-20 16:31:12 +01:00
lain 2199d63ddc StatusControllerTest: Fix typo 2020-01-20 15:31:14 +01:00
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats 2020-01-20 14:27:59 +01:00
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop' 
fix oauth scopes for AdminApi#reports_update

See merge request pleroma/pleroma!2087
 2020-01-20 12:07:12 +00:00
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop' 
Hashtag benchmarks

See merge request pleroma/pleroma!2116
 2020-01-20 11:26:07 +00:00
lain 271afcd940 Add benchmark of any/all tag options 2020-01-20 12:19:15 +01:00
rinpatch 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop' 
transmogrifier.ex: simplify handle_incoming of actors

See merge request pleroma/pleroma!2114
 2020-01-20 10:25:17 +00:00
lain 7731f9a447 Merge branch 'feat/startup-migration-check' into 'develop' 
Check for unapplied migrations on startup

Closes #1328

See merge request pleroma/pleroma!2112
 2020-01-20 09:56:16 +00:00
rinpatch dc0498ab2b Check for unapplied migrations on startup 
Closes #1328
 2020-01-20 12:20:26 +03:00
rinpatch 205e73058d mix.lock: update mock to 0.3.4 
This version adds Mock.passthrough/1 which I need to use in a test
 2020-01-19 13:42:52 +03:00
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors 2020-01-19 07:06:15 +01:00
feld 52a0bf62f5 Merge branch 'ci/docker-imaging' into 'develop' 
ci/docker imaging

See merge request pleroma/pleroma!2110
 2020-01-15 22:52:53 +00:00
jp 1e17ad2275 Update docker release / stable jobs 2020-01-15 17:25:33 -05:00
jp ffab411327 Update docker jobs for release branches and stable branches 2020-01-15 16:54:53 -05:00
jp 0c9499bf25 Fix only: on docker develop/latest job 2020-01-15 16:41:41 -05:00
jp 4d19f38753 update only: for release/ branch regex matching. and to avoid running image builds on unnecessary forks 2020-01-15 16:23:43 -05:00
jp cc4c3255fe Fix odd spacing 2020-01-15 16:16:29 -05:00
lain 6317183acd Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop' 
[#1478] OAuth `admin` scopes tweaks

Closes #1478

See merge request pleroma/pleroma!2081
 2020-01-15 15:44:49 +00:00
Ivan Tashkinov d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. 2020-01-15 18:38:18 +03:00
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
lain 1b233aa653 Merge branch 'notifications-from-account' into 'develop' 
[#1470] Add support for `account_id` param to filter notifications by the account

See merge request pleroma/pleroma!2073
 2020-01-15 14:05:22 +00:00
Egor Kislitsyn 023b7f605b
Fix notification controller test 2020-01-15 16:51:09 +04:00
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account 2020-01-15 16:49:45 +04:00
lain 167e9c45ec Benchmarks: Move to correct folder 2020-01-15 12:37:50 +01:00
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements. 2020-01-15 12:11:23 +03:00
feld 77412d5dd2 Merge branch 'features/docker-updates' into 'develop' 
Features/docker updates

See merge request pleroma/pleroma!2105
 2020-01-14 21:36:52 +00:00
jp a58a0a7b1b Remove forked test branch matching 2020-01-14 13:47:36 -05:00
jp ff15d6ef13 Remove artifacts passing by setting dependencies: [] 2020-01-14 13:45:47 -05:00
lain b4532277b1 Merge branch 'features/docker-updates' into 'develop' 
Features/docker updates

See merge request pleroma/pleroma!2104
 2020-01-14 17:48:58 +00:00
jp 964d188a96 Add allow_failure to docker jobs 2020-01-14 12:43:28 -05:00
jp fe57e5139f Remove cache from docker jobs. Split devlop and stable branches into their own jobs 2020-01-14 12:32:36 -05:00
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags 2020-01-14 17:24:26 +01:00
lain d150c598d7 Merge branch 'warnings-fix' into 'develop' 
compilation warnings fix

See merge request pleroma/pleroma!2102
 2020-01-14 16:11:36 +00:00
Alexander Strizhakov 0d331f3d23
compilation warnings fix 2020-01-14 15:49:52 +03:00
lain 12b28c8925 Merge branch 'feature/ci-registry' into 'develop' 
Update Dockerfile with labels. Update gitlab-ci for registry usage

See merge request pleroma/pleroma!2098
 2020-01-13 15:25:41 +00:00
feld a431e8c9f7 Merge branch 'feature/attachments-cleanup' into 'develop' 
Delete attachments when status is deleted

See merge request pleroma/pleroma!2036
 2020-01-12 18:48:59 +00:00
Roman Chvanikov 88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
feld 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop' 
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)

See merge request pleroma/pleroma!2080
 2020-01-12 18:37:52 +00:00
feld 6cc5341d26 Merge branch 'config/benchmark' into 'develop' 
Benchmark env uses test database so we should be able to use test.secret.exs

See merge request pleroma/pleroma!2057
 2020-01-12 18:31:10 +00:00
feld bb5862ea2f Merge branch 'issue/1354' into 'develop' 
[#1354] fix remote follow

See merge request pleroma/pleroma!2079
 2020-01-12 18:20:31 +00:00
Mark Felder e64059d218 Assign token that can write to follows 2020-01-12 12:14:09 -06:00
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
feld ea4a462858 Merge branch 'issue/1487' into 'develop' 
[#1487] fixed clear  HTML entities after scrub html and truncate

See merge request pleroma/pleroma!2090
 2020-01-12 17:25:25 +00:00
rinpatch ecb8fe183c Merge branch 'patch-1' into 'develop' 
docs: API: update Mastodon API link

See merge request pleroma/pleroma!2100
 2020-01-11 17:38:12 +00:00
rinpatch a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop' 
Remove MDII uploader

See merge request pleroma/pleroma!2099
 2020-01-11 17:19:54 +00:00
Hakaba Hitoyo 0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alibek Omarov e1308f10bd docs: API: update Mastodon API link 2020-01-11 05:06:40 +00:00
jp 2ef8f0be6c Update Dockerfile with labels. Update gitlab-ci for registry usage 2020-01-10 14:09:14 -05:00
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 
# Conflicts:
#	lib/pleroma/user.ex
 2020-01-10 16:18:32 +03:00
lain 05ca420c09 Merge branch 'issue/1490' into 'develop' 
[#1490] fixed create  service user   (relay, internal.fetch)

See merge request pleroma/pleroma!2092
 2020-01-10 13:14:20 +00:00