lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
2020-10-15 12:28:25 +02: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 |
|
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
2020-10-14 15:27:15 -05:00 |
|
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
2020-10-14 19:33:54 +00:00 |
|
|
swentel
|
42112b842c
|
Change handle and url of contact person for Indigenous client
|
2020-10-14 21:32:18 +02:00 |
|
|
Alex Gleason
|
83770b7b39
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-14 12:33:24 -05: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
|
b001237b79
|
Finish undoing API breakage
|
2020-10-14 10:44:18 -05:00 |
|
|
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
2020-10-14 09:54:07 -05:00 |
|
|
Alex Gleason
|
dc38dc8472
|
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
|
2020-10-13 22:01:27 -05:00 |
|
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-10-13 19:26:04 -05:00 |
|
|
Alex Gleason
|
7d8f610720
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-10-13 19:25:18 -05:00 |
|
|
Alex Gleason
|
b3d6cf9022
|
Merge remote-tracking branch 'upstream/develop' into block-behavior
|
2020-10-13 19:22:32 -05:00 |
|
|
Alex Gleason
|
c3112fd13a
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-10-13 19:20:00 -05:00 |
|
|
Mark Felder
|
8b20c4d275
|
Missed tests
|
2020-10-13 16:15:28 -05:00 |
|
|
Ali Riza Keles
|
943f65c739
|
Include python script and description
|
2020-10-13 19:58:38 +01: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 |
|
|
Egor Kislitsyn
|
2b58b0dbce
|
Update CHANGELOG
|
2020-10-13 21:58:26 +04:00 |
|
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
2020-10-13 21:58:18 +04: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 |
|
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
2020-10-13 21:39:41 +04: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
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
2020-10-13 09:54:53 -05:00 |
|
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-13 09:54:11 -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
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
2020-10-13 09:45:08 -05: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 |
|