lain
|
fec1ed802e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
2020-11-17 15:01:38 +01:00 |
|
|
lain
|
81293e5aad
|
ActivityPubController: Don't return local only objects
|
2020-11-17 13:11:39 +01:00 |
|
|
Mark Felder
|
2156de2fee
|
Ingest blurhash field during transmogrification
|
2020-11-11 13:39:02 -06:00 |
|
|
Mark Felder
|
6fd72e9e85
|
Ingest blurhash for attachments if they were federated
|
2020-11-11 12:27:51 -06:00 |
|
|
Alexander Strizhakov
|
8da9f919f8
|
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
|
2020-11-11 18:49:15 +03:00 |
|
|
Egor Kislitsyn
|
0118ccb53c
|
Add local visibility
|
2020-11-11 18:54:01 +04:00 |
|
|
Alexander Strizhakov
|
f97f24b067
|
making credo happy and test fix
|
2020-11-11 10:48:03 +03:00 |
|
|
Alexander Strizhakov
|
efc27f6464
|
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
|
2020-11-11 10:10:57 +03:00 |
|
|
Alexander Strizhakov
|
485697d96c
|
config descriptions for custom MRF policies
|
2020-11-10 19:20:14 +03:00 |
|
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
2020-11-04 15:05:01 +01:00 |
|
|
lain
|
c7bcbfbc1d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
2020-11-04 11:47:41 +01:00 |
|
|
lain
|
24ce324973
|
Merge branch 'bugfix/poll_replies_count' into 'develop'
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
|
2020-11-02 12:08:20 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
4caad4e910
|
side_effects: Don’t increase_replies_count when it’s an Answer
|
2020-11-02 05:56:17 +01:00 |
|
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
2020-10-31 05:50:59 +03:00 |
|
|
Egor Kislitsyn
|
8542d2efee
|
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
|
2020-10-29 14:51:23 +04:00 |
|
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
2020-10-28 19:03:40 +03:00 |
|
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 18:59:19 +00:00 |
|
|
lain
|
de6d49c8ce
|
ActivityPub: Add back debug call + explanation.
|
2020-10-26 16:33:26 +01:00 |
|
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
2020-10-26 16:30:48 +01:00 |
|
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
2020-10-26 02:09:20 +00:00 |
|
|
rinpatch
|
df61071422
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
2020-10-23 19:39:42 +00:00 |
|
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
2020-10-23 13:53:01 +02:00 |
|
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
2020-10-22 20:33:52 +00:00 |
|
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
2020-10-22 12:22:08 +02:00 |
|
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
2020-10-19 15:46:24 +02:00 |
|
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
2020-10-19 15:40:50 +02:00 |
|
|
Egor Kislitsyn
|
18a91d85e5
|
Merge branch 'develop' into feature/local-only-scope
|
2020-10-19 15:31:56 +04:00 |
|
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
2020-10-19 04:26:35 +00:00 |
|
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
2020-10-17 17:53:47 +03:00 |
|
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
2020-10-17 13:12:39 +03:00 |
|
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
|
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
2020-10-15 19:07:00 +04:00 |
|
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
2020-10-15 18:37:44 +04:00 |
|
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
2020-10-15 12:28:25 +02:00 |
|
|
feld
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
2020-10-14 19:33:54 +00: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 |
|
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
2020-10-14 10:44:18 -05:00 |
|
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
2020-10-13 19:26:04 -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 |
|
|
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
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +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
|
8c993c5f63
|
FederatingPlug module name
|
2020-10-13 16:43:55 +03:00 |
|
|
Mark Felder
|
8539e386c3
|
Add missing Copyright headers
|
2020-10-12 12:00:50 -05:00 |
|
|
Ivan Tashkinov
|
2498e569f1
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
|
2020-10-11 22:34:48 +03:00 |
|