Oneric/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity
12,039 commits 6 branches 84 tags 311 MiB
Commit graph

12,039 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
6c1bc9ca39 CHANGELOG.md: prepare 2.2.0 changelog 2020-10-15 21:43:46 +03:00
rinpatch
65b73eb9fd mix.exs: bump version to 2.2.0 2020-10-15 21:43:35 +03:00
feld
b48724afcd Merge branch 'docs-indigenous' into 'develop' 
Change handle and url of contact person for Indigenous client

See merge request pleroma/pleroma!3082
 2020-10-14 20:31:23 +00:00
swentel
42112b842c Change handle and url of contact person for Indigenous client 2020-10-14 21:32:18 +02:00
feld
2013705690 Merge branch 'feature/gen-magic' into 'develop' 
Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534
 2020-10-14 17:31:45 +00:00
Haelwenn
9a85ec0da0 Merge branch 'refactor/locked_user_field' into 'develop' 
Change user.locked field to user.is_locked

See merge request pleroma/pleroma!3077
 2020-10-14 16:17:32 +00:00
Mark Felder
ed61002815 Undo API breaking changes 2020-10-14 11:03:17 -05:00
Mark Felder
8b20c4d275 Missed tests 2020-10-13 16:15:28 -05:00
Haelwenn
481906207e Merge branch 'bugfix/file-consistency-prod' into 'develop' 
Move Consistency.FileLocation to ./test

See merge request pleroma/pleroma!3079
 2020-10-13 18:19:24 +00:00
Haelwenn (lanodan) Monnier
f5d8af1db1
 		Move Consistency.FileLocation to ./test 
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
 2020-10-13 19:57:45 +02:00
Mark Felder
09be8cb336 Credo 2020-10-13 12:49:43 -05:00
Mark Felder
40f3cdc030 JPEG content_type must be image/jpeg 2020-10-13 10:37:24 -05:00
Mark Felder
b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder
409f694e4f Merge branch 'develop' into refactor/locked_user_field 2020-10-13 09:54:29 -05:00
feld
8b6221d4ec Merge branch 'feature/1822-files-consistency' into 'develop' 
Feature/1822 files consistency

Closes #1822

See merge request pleroma/pleroma!2680
 2020-10-13 14:47:29 +00:00
Mark Felder
9968b7efed Change user.locked field to user.is_locked 2020-10-13 09:31:13 -05:00
Alexander Strizhakov
4c4ea9a348
 		changes after rebase 2020-10-13 17:10:34 +03:00
Alexander Strizhakov
3cb9c88837
 		migration and warning for RemoteIp plug rename 2020-10-13 16:44:04 +03:00
Alexander Strizhakov
5f2071c458
 		changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov
bb111465a1
 		credo fix after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov
7f5dbb0201
 		changes after rebase 2020-10-13 16:44:03 +03:00
Alexander Strizhakov
b081080dd9
 		fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov
f679486540
 		rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov
c4c5caedd8
 		changes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov
1d0e130cb3
 		fixes after rebase 2020-10-13 16:44:02 +03:00
Alexander Strizhakov
7f82f18664
 		exclude file_location check from coveralls 2020-10-13 16:44:01 +03:00
Alexander Strizhakov
c8418e2d1f
 		fix after rebase 2020-10-13 16:44:01 +03:00
Alexander Strizhakov
b720ad2264
 		files consistency after rebase 2020-10-13 16:44:01 +03:00
Alexander Strizhakov
c5efded5fd
 		files consistency for new files 2020-10-13 16:44:00 +03:00
Alexander Strizhakov
0f8ab46a0e
 		fix after rebase 2020-10-13 16:44:00 +03:00
Alexander Strizhakov
207211a2b3
 		update files consistency after rebase 2020-10-13 16:44:00 +03:00
Alexander Strizhakov
3c8c540707
 		copyright 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
e33782455d
 		updates after rebase 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
b6eb7997f5
 		special namespaces for phoenix and api_spec 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
9f4fe5485b
 		alias alphabetically order 2020-10-13 16:43:59 +03:00
Alexander Strizhakov
3ef4e9d170
 		AdminSecretAuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov
c497558d43
 		AuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov
c1777e7479
 		BasicAuthDecoderPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov
970932689f
 		DigestPlug rename 2020-10-13 16:43:57 +03:00
Alexander Strizhakov
66e0b0065b
 		Cache plug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov
c6baa811d6
 		EnsureAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov
011525a3d1
 		EnsurePublicOrAuthenticatedPlug module name 2020-10-13 16:43:57 +03:00
Alexander Strizhakov
8e301a4c37
 		EnsureUserKeyPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov
d6cb1a3b46
 		ExpectAuthenticatedCheckPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov
99e4ed21b1
 		ExpectPublicOrAuthenticatedCheckPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov
8c993c5f63
 		FederatingPlug module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov
abc3c7689b
 		HTTPSecurityPlug module name and filename 2020-10-13 16:43:55 +03:00
Alexander Strizhakov
5cd7030076
 		IdempotencyPlug module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov
8dfaa54ffc
 		InstanceStatic module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov
e2332d92ce
 		LegacyAuthenticationPlug module name 2020-10-13 16:43:54 +03:00