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 |
|
|
|
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 |
|
|
|
77bca41595
|
Apply 3 suggestion(s) to 3 file(s)
|
2020-10-14 19:33:54 +00:00 |
|
|
|
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 |
|
Ivan Tashkinov
|
e1eb54d389
|
[#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
|
2020-10-11 13:37:19 +03:00 |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
2020-10-09 11:26:10 -05:00 |
|
Alex Gleason
|
3f9263fb16
|
Merge remote-tracking branch 'upstream/develop' into restrict-origin
|
2020-10-08 17:24:09 -05:00 |
|
Mark Felder
|
218a3e61e1
|
Fix incompatible types warning (Elixir 1.11)
|
2020-10-07 10:04:25 -05:00 |
|
Mark Felder
|
636c00037d
|
Fix duplicate @doc entries
|
2020-10-07 09:58:45 -05:00 |
|
rinpatch
|
2698bbc9f6
|
Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
|
2020-10-06 18:11:34 +00:00 |
|
Ivan Tashkinov
|
094edde7c4
|
[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
|
2020-10-05 23:48:00 +03:00 |
|
Haelwenn (lanodan) Monnier
|
f497eb034d
|
activity_pub_controller.ex: Remove unused @doc block
[ci skip]
|
2020-10-05 21:11:00 +02:00 |
|
Maksim Pechnikov
|
de993b856b
|
added force option to the unfollow operation
|
2020-09-28 09:16:42 +03:00 |
|
Haelwenn (lanodan) Monnier
|
5e86a2809e
|
transmogrifier: Drop incoming create early if it already exists
|
2020-09-23 13:40:45 +02:00 |
|
lain
|
ee3052a2d8
|
ActivityPub: Return Announces when filtering by following.
|
2020-09-22 14:20:19 +02:00 |
|
lain
|
f2f0a0260f
|
ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
|
2020-09-21 16:08:38 +02:00 |
|
|
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
2020-09-18 18:38:20 +00:00 |
|
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
2020-09-18 11:58:22 +00:00 |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
2020-09-17 22:22:59 +03:00 |
|
Haelwenn (lanodan) Monnier
|
abf25e5d52
|
Create MRF.filter_pipeline to inject :object_data when present
|
2020-09-17 22:07:54 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3a0f99ed35
|
KeywordPolicy: Still match when fields are absent
|
2020-09-17 22:07:54 +03:00 |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
2020-09-17 17:14:20 +03:00 |
|
rinpatch
|
eca8d26784
|
Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
|
2020-09-16 13:37:04 +00:00 |
|
rinpatch
|
adbd0032fa
|
Merge branch 'features/validators-video' into 'develop'
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
|
2020-09-16 13:36:27 +00:00 |
|
Ivan Tashkinov
|
2f155fb89f
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
2020-09-15 20:29:39 +03:00 |
|
eugenijm
|
3ab59a6f3c
|
Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user
|
2020-09-15 13:00:56 +03:00 |
|
Mark Felder
|
709723182d
|
Ensure SimplePolicy's tags in string representation don't trip up the object validator
|
2020-09-14 17:06:42 -05:00 |
|
Mark Felder
|
c0b36621f1
|
Ensure we only apply NSFW Simple policy on parsable objects
|
2020-09-11 23:22:14 -05:00 |
|
Haelwenn (lanodan) Monnier
|
f1f44069ae
|
Fetcher: Correctly return MRF reject reason
|
2020-09-11 20:00:41 +02:00 |
|
Ivan Tashkinov
|
0bda85857e
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
# lib/pleroma/instances/instance.ex
|
2020-09-11 17:19:58 +03:00 |
|
Haelwenn (lanodan) Monnier
|
f18178cb09
|
AttachmentValidator: directly embed url schema and pass it fix_media_type
|
2020-09-11 01:40:20 +02:00 |
|
Haelwenn (lanodan) Monnier
|
1b3d5956b1
|
Pipeline Ingestion: Article
|
2020-09-11 01:40:20 +02:00 |
|
Haelwenn (lanodan) Monnier
|
2132b24a9d
|
object_validators: likes & announcements as [ObjectID]
|
2020-09-11 01:39:39 +02:00 |
|
Haelwenn (lanodan) Monnier
|
846b59ccb0
|
Pipeline Ingestion: Video
|
2020-09-11 01:39:39 +02:00 |
|
Haelwenn (lanodan) Monnier
|
b73e9ef686
|
transmogrifier: Call strip_internal_fields on pipeline ingestion
|
2020-09-11 01:39:38 +02:00 |
|
Mark Felder
|
55562ca936
|
Merge branch 'develop' into feature/gen-magic
|
2020-09-10 16:05:22 -05:00 |
|
Alexander Strizhakov
|
357d971a10
|
expiration for new pipeline
|
2020-09-10 21:50:41 +03:00 |
|
Alexander Strizhakov
|
93e1c8df9d
|
reject activity creation
if passed expires_at option and expiring activities are not configured
|
2020-09-10 21:50:41 +03:00 |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
2020-09-10 21:50:40 +03:00 |
|
rinpatch
|
541a3eede2
|
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
|
2020-09-10 18:41:00 +00:00 |
|
Ivan Tashkinov
|
148bc24435
|
[#2497] Removed Hackney-specific code
(no longer needed due to adapter options unification).
|
2020-09-10 11:54:10 +03:00 |
|
Mark Felder
|
4ee99dafcc
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-09 11:11:36 -05:00 |
|
Haelwenn (lanodan) Monnier
|
10ef532c63
|
AP C2S: Restrict character limit on Note
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
ee0e05f930
|
Drop unused "inReplyToAtomUri" in objects
|
2020-09-08 18:43:57 +02:00 |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
2020-09-08 09:31:26 -05:00 |
|
|
|
95688c90ad
|
ForceBotUnlistedPolicy: simplify code
|
2020-09-08 01:15:15 +02:00 |
|
|
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
2020-09-07 22:53:45 +02:00 |
|
|
|
699224a900
|
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
|
2020-09-07 22:15:42 +02:00 |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
2020-09-07 19:59:17 +03:00 |
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
2020-09-07 19:59:17 +03:00 |
|
Ivan Tashkinov
|
88a6ee4a59
|
[#2497] Func defs grouping fix.
|
2020-09-05 20:23:18 +03:00 |
|
Ivan Tashkinov
|
f170d47130
|
[#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
Removed :preview pool in favor of existing :media one. Misc. refactoring.
|
2020-09-05 20:19:09 +03:00 |
|
Mark Felder
|
85446cc30c
|
Merge branch 'develop' into media-preview-proxy
|
2020-09-03 10:34:06 -05:00 |
|
lain
|
9433311923
|
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
|
2020-09-03 11:50:30 +00:00 |
|
rinpatch
|
126461942b
|
User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
|
2020-09-01 10:45:42 +03:00 |
|
Haelwenn (lanodan) Monnier
|
b960cede9a
|
common_fixes: Force inserting context and context_id
|
2020-09-01 08:35:00 +02:00 |
|
Haelwenn (lanodan) Monnier
|
a142da3e4f
|
Add new Emoji Ecto.Type and fix emoji in Question
|
2020-09-01 08:34:57 +02:00 |
|
Haelwenn (lanodan) Monnier
|
2ecc7d9230
|
transmogrifier: Remove mastodon emoji-format from emoji field
|
2020-09-01 08:29:53 +02:00 |
|
Mark Felder
|
479578b148
|
Merge branch 'develop' into feld-2168-media-preview-proxy
|
2020-08-25 11:57:23 -05:00 |
|
|
|
d39abd02ac
|
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
|
2020-08-24 17:03:18 +00:00 |
|
Mark Felder
|
4e6eb22b4a
|
Try to warm the cache with the preview image if preview proxy enabled
|
2020-08-21 12:19:35 -05:00 |
|
Haelwenn (lanodan) Monnier
|
36c125a071
|
Pipeline Ingestion: Event
|
2020-08-20 21:49:26 +02:00 |
|
Alexander Strizhakov
|
7dc275b69b
|
relay fix for admin-fe
|
2020-08-19 08:41:39 +03:00 |
|
Haelwenn (lanodan) Monnier
|
5316e231b0
|
Pipeline Ingestion: Audio (Part 2)
|
2020-08-19 00:06:31 +02:00 |
|
lain
|
3998ef9d64
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
|
2020-08-18 13:31:42 +02:00 |
|
