Egor Kislitsyn
a781ac6ca5
Fix atom leak in AdminAPIController
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
Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
2020-09-08 15:26:06 +03:00
Roman Chvanikov
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
2020-09-08 15:16:43 +03:00
Roman Chvanikov
e3f845b243
Add expiring mutes for activities
2020-09-08 15:13:50 +03:00
rinpatch
4b76d7ce67
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
...
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
2020-09-08 14:00:00 +03:00
lain
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-08 13:56:42 +03:00
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
Alibek Omarov
95688c90ad
ForceBotUnlistedPolicy: simplify code
2020-09-08 01:15:15 +02:00
Alibek Omarov
8b695c3eeb
ForceBotUnlistedPolicy: format
2020-09-07 22:53:45 +02:00
Alibek Omarov
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
lain
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-07 10:19:19 +00:00
Maksim Pechnikov
917d325972
added api spec
2020-09-07 07:17:30 +03:00
Maksim Pechnikov
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
rinpatch
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
2020-09-05 22:05:35 +03:00
rinpatch
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
2020-09-05 20:53:46 +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
Ivan Tashkinov
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
2020-09-05 16:16:35 +03:00
Mark Felder
d1e1057e22
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
2020-09-03 14:48:43 -05:00
Mark Felder
6141eb94ab
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
...
Use a separate pool for preview requests
2020-09-03 14:42:11 -05:00
Ivan Tashkinov
60c925380d
[ #2497 ] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
2020-09-03 20:13:29 +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
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
2020-09-02 17:03:45 +00:00
lain
581f382e71
ListController: DRY up stuff.
2020-09-02 18:32:00 +02:00
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
rinpatch
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
Ivan Tashkinov
6ce28c4091
[ #2497 ] Fix for png media proxy preview response headers (content-type & content-disposition).
2020-09-01 21:21:58 +03:00
Alexander Strizhakov
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +03:00
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
2020-09-01 12:49:32 +02: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
Maksim Pechnikov
0d5088c2b8
remove unread_conversation_count
from User
2020-09-01 09:37:08 +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
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
2020-08-31 20:55:05 +00:00
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
2020-08-31 16:48:17 +02:00
Ivan Tashkinov
0a839d51a7
[ #2497 ] Added Cache-Control response header for media proxy preview endpoint.
2020-08-31 13:08:50 +03:00
lain
d91c4feebe
Notification: Small refactor.
2020-08-31 11:02:54 +02:00
Mark Felder
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-30 11:28:45 -05:00
Mark Felder
2d2af75777
Support PNG previews to preserve alpha channels
2020-08-30 09:17:24 -05:00
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
Mark Felder
5b4d483f52
Add a note about the avatars and banners situation
2020-08-27 17:28:21 -05:00
Mark Felder
67c79394e8
Support static avatars and header images with Mediaproxy Preview
2020-08-27 17:15:23 -05:00
Mark Felder
ef9d12fcc5
Attempt at supporting video thumbnails via ffmpeg
2020-08-27 12:31:55 -05:00
Haelwenn
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
2020-08-27 17:05:53 +00:00
Mark Felder
157ecf4022
Follow redirects.
...
I think we should be using some global adapter options here, though.
2020-08-27 11:46:56 -05:00
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
Mark Felder
eead2276e7
Ensure GIFs are redirected to the original or they become static.
2020-08-26 16:18:11 -05:00
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
Mark Felder
ddbddc08fc
Redirects for videos right now
2020-08-25 17:31:55 -05:00
Mark Felder
899ea2da3e
Switch to imagemagick, only support videos
2020-08-25 17:18:22 -05:00
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
...
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
2020-08-25 21:32:32 +00:00
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
lain
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
feld
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
98f8851f29
Use the image thumbnail for rich metadata (OGP/Twittercards)
2020-08-22 15:12:11 -05:00
Maksim Pechnikov
0922791e4d
updated errors on add emoji
2020-08-22 10:56:26 +03:00
Maksim Pechnikov
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03: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
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
Alexander Strizhakov
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
Ivan Tashkinov
aa0a5ffb48
[ #2497 ] Media preview proxy: added quality
config setting, adjusted width/height defaults.
2020-08-21 08:59:08 +03:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
Ivan Tashkinov
02ad1cd8e9
[ #2497 ] Media preview proxy: added Content-Disposition header with filename to response.
2020-08-20 09:58:50 +03:00
Ivan Tashkinov
4ee15e991e
[ #2497 ] Media preview proxy config refactoring & documentation.
2020-08-19 21:36:26 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
Maksim Pechnikov
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
lain
3998ef9d64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
2020-08-18 13:31:42 +02:00
lain
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
2020-08-18 12:38:13 +02:00
Haelwenn (lanodan) Monnier
2f8c3c842d
common_fixes: Remove Utils.make_date call
2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier
c9d6638461
common_fixes: Get fixes common from Audio and Question
2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier
2bc08d5573
Pipeline Ingestion: Audio
2020-08-18 02:02:34 +02:00
Haelwenn (lanodan) Monnier
7a273087ed
object_validators: Use ecto_types where available
2020-08-17 23:47:00 +02:00
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +03:00
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
2020-08-13 18:10:43 +02:00
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
lain
2e347e8286
ActivityPub: Remove reject
, move everything to the Pipeline.
2020-08-12 15:07:46 +02:00
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
lain
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02:00
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
lain
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
2020-08-11 15:41:19 +02:00
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
2020-08-11 15:13:29 +03:00
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
2020-08-11 09:18:56 +00:00
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 10:55:10 +02:00
lain
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
lain
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
Alex Gleason
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
Alex Gleason
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
lain
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02:00
Ivan Tashkinov
135ae4e35a
[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
2020-08-06 16:00:00 +03:00
lain
10b0e55acf
Merge branch 'whole-word-filter-hotfix' into 'develop'
...
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
2020-08-06 08:35:39 +00:00
Alex Gleason
24ce9c011c
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 19:33:51 +00:00
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-08-05 13:08:31 -05:00
Alex Gleason
ad9c925efb
Speed up instance timeline query
2020-08-05 13:08:13 -05:00
Mark Felder
81126b0142
Add email to user account only if it exists in LDAP
2020-08-05 11:36:12 -05:00
lain
9d7ce1a6d0
CommonValidations: More refactors.
2020-08-05 17:56:12 +02:00
lain
3655175639
CommonValidations: Refactor same_domain?
2020-08-05 17:36:27 +02:00
lain
9c96fc052a
CommonValidations: Extract modification right checker
2020-08-05 17:26:53 +02:00
Mark Felder
2192d1e492
Permit LDAP users to register without capturing their password hash
...
We don't need it, and local auth fallback has been removed.
2020-08-05 10:07:31 -05:00
Mark Felder
0f9aecbca4
Remove fallback to local database when LDAP is unavailable.
...
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
2020-08-05 08:18:16 -05:00
Mark Felder
f7146583e5
Remove LDAP mail attribute as a requirement for registering an account
2020-08-05 08:15:57 -05:00
lain
f889400d05
Questions: Move fixes to validators.
2020-08-05 14:51:33 +02:00
lain
70522989d9
Apply 1 suggestion(s) to 1 file(s)
2020-08-05 11:14:58 +00:00
lain
00c4c6a382
CommonValidations: Remove superfluous function
...
The `is_active` functionality was integrated into the presence
checker.
2020-08-05 12:24:34 +02:00
lain
19c108170e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-05 11:12:14 +02:00
MK Fain
f341a8e142
Update filter_view.ex to return whole_word actual value
2020-08-05 02:01:27 +00:00
Karol Kosek
577b11167c
templates/layout/app.html.eex: fix link color
2020-08-05 00:01:30 +02:00
rinpatch
b1b6a7dfa8
Merge branch 'deactivated-user-posts' into 'develop'
...
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
2020-08-04 19:17:30 +00:00
rinpatch
fede37e4c6
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
...
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
2020-08-04 19:16:38 +00:00
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
2020-08-04 18:26:37 +04:00
lain
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-04 15:28:41 +02:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
2020-08-04 14:29:16 +02:00
lain
1a00713744
CommonValidations: Treat deactivated users as not present.
2020-08-04 14:17:03 +02:00
Mark Felder
016d8d6c56
Consolidate construction of Rich Media Parser HTTP requests
2020-08-03 12:37:31 -05:00
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
lain
5876d5123c
Merge branch 'object-age-fix' into 'develop'
...
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
2020-08-03 12:50:10 +00:00
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
2020-08-03 14:12:32 +02:00
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
2020-07-31 13:57:21 +02:00
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31 14:13:38 +03:00
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
2020-07-31 09:57:30 +02:00
Haelwenn
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
2020-07-30 20:08:03 +00:00
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
2020-07-30 20:01:04 +00:00
lain
a3c37379e9
ChatMessage schema: Add preview cards.
2020-07-30 19:57:45 +02:00
lain
781b270863
ChatMessageReferenceView: Display preview cards.
2020-07-30 19:57:26 +02:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
lain
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
2020-07-29 14:42:09 +02:00
Haelwenn
269b61a240
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
...
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
2020-07-29 12:20:04 +00:00
lain
de5c7e20a3
Merge branch 'bugfix/remote-user-atom' into 'develop'
...
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
2020-07-29 12:16:20 +00:00
Haelwenn (lanodan) Monnier
2e27847573
feed/user_controller: Return 404 when the user is remote
2020-07-29 14:02:02 +02:00
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
lain
66974e17a0
Endpoint: Serve a dynamically configured admin interface
2020-07-29 13:03:04 +02:00
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
2020-07-29 11:47:03 +02:00
lain
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
2020-07-29 10:53:08 +02:00
Alex Gleason
2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
2020-07-28 20:32:58 -05:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
lain
ad5c42628a
FrontendStatic: Add plug to serve frontends based on configuration.
2020-07-28 17:35:16 +02:00
lain
e5ac9534aa
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
...
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
2020-07-28 07:41:44 +00:00
Alex Gleason
f688c8df82
Fix User.registration_reason HTML sanitizing issues
2020-07-27 20:36:31 -05:00
lain
e1a1c8e7de
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
2020-07-27 16:35:47 +00:00
Haelwenn (lanodan) Monnier
4a6389316d
masto_fe_view: Remove @default_settings
2020-07-27 17:59:13 +02:00
lain
9e6f4694dd
Pipeline: Unify embedded_object / object_data, move to validator.
2020-07-27 16:39:50 +02:00
lain
762c9ea564
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
2020-07-27 16:19:45 +02:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Alibek Omarov
6107440ea0
OpenAPI: remove accidentally pasted buffer data
2020-07-26 13:59:46 +00:00
Alibek Omarov
b31844d6e0
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
2020-07-26 13:54:56 +00:00
Lain Soykaf
3d13fb05f8
Side Effects: On undoing, put information about the undone object.
2020-07-24 14:40:22 +02:00
Lain Soykaf
91f3cf9bc6
Pipeline: Add embedded object federation.
2020-07-24 14:06:41 +02:00
feld
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
2020-07-23 20:06:11 +00:00
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
Haelwenn
6100b90209
Merge branch '1976-status-view-fixes' into 'develop'
...
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
2020-07-23 16:58:36 +00:00
lain
76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
Ivan Tashkinov
9ea51a6de5
[ #2791 ] AccountView: renamed :force
option to :skip_visibility_check
.
2020-07-23 15:08:30 +03:00
lain
b2ba70eec4
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
2020-07-23 11:08:29 +00:00
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
2020-07-23 10:56:33 +00:00
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
2020-07-22 15:09:32 +00:00
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
Mark Felder
341a8f3500
Skip the correct plug
2020-07-21 17:26:59 -05:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Mark Felder
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
2020-07-21 16:25:45 -05:00
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
Alex Gleason
d0eb43b58b
Add account aliases
2020-07-17 16:17:49 -05:00
Haelwenn
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
2020-07-17 18:54:30 +00:00
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
Mark Felder
62438530e2
TOTP length is configurable, so we can't hardcode this here.
2020-07-17 08:19:49 -05:00
Alex Gleason
5e74556703
Sanitize reason
param in POST /api/v1/accounts
2020-07-16 20:25:53 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
Mark Felder
3be64556db
Improve TOTP token and recovery input fields in OAuth login
2020-07-16 13:11:03 -05:00
Alex Gleason
9ce95fa68f
Use approval_required
in /api/v1/instance
2020-07-15 17:04:30 -05:00
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
rinpatch
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
2020-07-15 14:00:22 +00:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
Haelwenn (lanodan) Monnier
e4beff90f5
Create Question: Add context field to create
2020-07-15 12:32:43 +02:00
Haelwenn (lanodan) Monnier
bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
2020-07-15 12:32:42 +02:00
Haelwenn (lanodan) Monnier
c19bdc811e
Fix attachments in polls
2020-07-15 12:32:42 +02:00
Haelwenn (lanodan) Monnier
d713930ea7
Fixup for EctoType module move
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
435a65b976
QuestionValidator: Use AttachmentValidator
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
fe6924d00d
CreateGenericValidator: add expires_at
2020-07-15 11:40:24 +02:00
Haelwenn (lanodan) Monnier
82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
2020-07-15 11:40:23 +02:00
Haelwenn (lanodan) Monnier
4f70fd4105
question_validator: remove conversation field
2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier
173f69c854
question_validator: fix for mastodon poll expiration
...
Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)
2020-07-15 11:39:56 +02:00
Haelwenn (lanodan) Monnier
47ba796f41
create_question_validator: remove validate_recipients_match
2020-07-15 11:39:55 +02:00
Haelwenn (lanodan) Monnier
4644a8bd10
Fix multiple-choice poll detection
2020-07-15 11:39:55 +02:00
Haelwenn (lanodan) Monnier
10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
89a2433154
QuestionOptionsValidator: inline schema for replies
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
c5efaf6b00
AnswerValidator: Create
2020-07-15 11:39:54 +02:00
Haelwenn (lanodan) Monnier
7bcd7a9595
QuestionValidator: Create
2020-07-15 11:39:53 +02:00
Alex Gleason
0d004a9d04
Email admins when a new unapproved account is up for review
2020-07-14 20:31:20 -05:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve
endpoint
2020-07-14 18:02:44 -05:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval
2020-07-14 14:29:03 -05:00
Alex Gleason
b750129da1
AdminAPI: Return approval_pending
with users
2020-07-14 13:47:05 -05:00
Maksim Pechnikov
1dd767b8c7
Include port in host for signatures
2020-07-14 21:44:08 +03:00
Alex Gleason
a1570ba6ad
AdminAPI: Return registration_reason
with users
2020-07-14 13:08:39 -05:00
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
2020-07-14 18:07:44 +00:00
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
2020-07-14 16:48:26 +00:00
Ivan Tashkinov
124b4709dc
[ #1940 ] Added admin_token
param (as admin_api_params/0
) to existing Admin API OpenAPI operations.
2020-07-14 19:31:05 +03:00
feld
246f49d685
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
...
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
2020-07-14 15:17:25 +00:00
Haelwenn (lanodan) Monnier
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
2020-07-14 11:04:16 +02:00
Alex Gleason
5ddf0415c4
Accept reason
in POST /api/v1/accounts and store in DB
2020-07-14 00:22:12 -05:00
=
b221b640a2
Transmogrifier: filtering weirdness in address fields
2020-07-13 22:43:21 +03:00
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
feld
5d215fd81f
Merge branch 'config-behaviours-runtime' into 'develop'
...
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
2020-07-13 15:45:25 +00:00
Haelwenn (lanodan) Monnier
ce243b107f
Use Logger.info for {:reject, reason}
2020-07-13 15:26:31 +02:00
Haelwenn (lanodan) Monnier
2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
2020-07-13 15:26:30 +02:00
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
2020-07-12 22:55:26 -05:00
Alex Gleason
51ab8d0128
Add account_approval_required
instance setting
2020-07-12 20:27:58 -05:00
href
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
2020-07-12 17:23:33 +02:00
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
Maksim Pechnikov
62fc8eab0d
fix reset confirmation email in admin section
2020-07-11 07:20:35 +03:00
lain
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
2020-07-10 14:10:44 +02:00
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
2020-07-10 08:55:15 +00:00
Mark Felder
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
2020-07-09 13:10:05 +00:00
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
2020-07-09 13:09:31 +00:00
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
2020-07-09 12:10:26 +00:00
eugenijm
c2be0da79f
Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials
returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content
is set to :unauthenticated
2020-07-09 14:57:40 +03:00
Haelwenn
68036f5a3b
Merge branch 'follow-pipeline' into 'develop'
...
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
2020-07-09 10:32:24 +00:00
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
2020-07-09 09:37:52 +00:00
lain
00e54f8fe7
ActivityPub: Remove follow
and fix issues.
2020-07-08 17:07:24 +02:00
lain
9dda8b5427
CommonAPI: Switch to pipeline for following.
2020-07-08 15:40:56 +02:00
lain
172f4aff8e
Transmogrifier: Move following to the pipeline.
2020-07-08 14:30:53 +02:00
lain
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
2020-07-08 13:23:07 +02:00
lain
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
2020-07-08 13:21:58 +02:00
lain
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
2020-07-08 10:55:03 +00:00
Ivan Tashkinov
a6495f4a68
[ #1895 ] credo fix.
2020-07-08 12:54:23 +03:00
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
Ivan Tashkinov
3f8370a285
[ #1895 ] Applied code review suggestion.
2020-07-08 12:36:44 +03:00
Maksim Pechnikov
e341f81785
fixed delete Like
activity in remove user
2020-07-08 09:06:23 +03:00
Haelwenn (lanodan) Monnier
31fef95e35
Add changelog and documentation
2020-07-08 06:29:24 +02:00
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
2020-07-08 06:28:40 +02:00
Haelwenn (lanodan) Monnier
013e2c5057
Use instances table instead of Cachex
2020-07-08 06:28:39 +02:00
Haelwenn (lanodan) Monnier
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
2020-07-08 06:28:39 +02:00
Haelwenn (lanodan) Monnier
f6d09fafee
Add support for remote favicons
2020-07-08 06:28:39 +02:00
Haelwenn
a8447c3803
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
...
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
2020-07-08 03:25:30 +00:00
Haelwenn
db13acf242
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
...
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
2020-07-08 03:05:20 +00:00
lain
8939ff39e4
Merge branch 'remove-twitter-api' into 'develop'
...
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
2020-07-07 18:26:07 +00:00
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect :restrict_unauthenticated
instance setting.
2020-07-07 20:37:11 +03:00
Mark Felder
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
2020-07-07 11:21:05 -05:00
lain
c8dd973af5
AccountController: Remove unused update_?
routes.
...
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
lain
59cf78e412
AccountController: Allow removal / reset of user images.
2020-07-07 16:53:03 +02:00
lain
9ad305209a
Merge branch 'bugfix/peertube-videos' into 'develop'
...
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
2020-07-07 09:14:50 +00:00
Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
2020-07-07 08:23:49 +00:00
Haelwenn (lanodan) Monnier
fbb9743a70
Fix getting videos from peertube
2020-07-07 09:38:38 +02:00
Haelwenn
d81acb5f62
Merge branch 'description-limits' into 'develop'
...
Add limits to image descriptions
See merge request pleroma/pleroma!2724
2020-07-07 03:00:52 +00:00
lain
a6a12b241f
FollowValidator: Add basic validation.
2020-07-06 15:57:19 +02:00
lain
28feba8af4
Preloaders: Remove status_net preloader
2020-07-06 12:24:45 +02:00
lain
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
2020-07-06 12:15:59 +02:00
lain
208baf157a
ActivityPub: Add new 'capabilities' to user.
2020-07-06 11:38:40 +02:00
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
lain
cc8b4e48d9
InstanceView: Add chat limit, description limit
2020-07-06 11:12:37 +02:00
Alexander Strizhakov
20c27bef40
renaming back and reject nil on create
2020-07-06 09:30:42 +03:00
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +03:00
Roman Chvanikov
fc1f34b851
Delete activity before sending response to client
2020-07-06 00:01:25 +03:00
Ivan Tashkinov
9faa632037
[ #2497 ] Fixed merge issue.
2020-07-05 19:02:43 +03:00
lain
cf56655614
Streamer: Don't filter out announce notifications.
2020-07-04 17:11:37 +02:00
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
2020-07-03 15:06:33 +00:00
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
2020-07-03 16:44:31 +02:00
lain
945e75c8e8
SearchController: Trim query.
2020-07-03 16:36:55 +02:00
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
lain
4a7b89e372
ChatMessageValidator: Additional validation.
2020-07-03 15:13:27 +02:00
lain
3ca9af1f9f
Account Schema: Add accepts_chat_messages
2020-07-03 14:31:04 +02:00
lain
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
2020-07-03 13:58:34 +02:00
lain
26a7cc3f00
UserView: Add acceptsChatMessages field
2020-07-03 13:38:59 +02:00
lain
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
2020-07-03 13:07:33 +02:00
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
Mark Felder
d44ec2bf4c
Remove camelCase from the keys
2020-07-02 12:55:08 -05:00
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
rinpatch
4c044f6225
Merge branch 'fetcher-fixes' into 'develop'
...
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
2020-07-02 10:17:51 +00:00
lain
bad08f34ca
Credo fixes.
2020-07-02 09:57:31 +02:00
lain
311b7c19d0
Streamer: Align announce streaming with polling.
2020-07-02 09:50:26 +02:00
lain
61fe94d698
SideEffects: Refactor.
2020-07-02 09:33:50 +02:00
lain
fedfe8f7d6
ActivityPub: Handle clashing nicknames for the same ap id
...
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
2020-07-01 12:26:07 +02:00
lain
ce92e6e5ce
Fetcher: Work when we can't get the OP.
2020-07-01 11:48:51 +02:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
Mark Felder
5a8e0208b1
Add fields limits to instance metadata, add tests
2020-06-30 15:25:10 -05:00
Mark Felder
0883a706dc
Merge branch 'develop' into activation-meta
2020-06-30 15:09:03 -05:00
Mark Felder
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
lain
8b7055e25e
Credo fixes
2020-06-30 11:55:58 +02:00
lain
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
2020-06-30 11:40:34 +02:00
lain
2382a2a151
Preload: Load the correct instance panel
2020-06-30 11:35:54 +02:00
Egor Kislitsyn
979f02ec94
Fix CastAndValidate plug
2020-06-29 17:33:00 +04:00
Egor Kislitsyn
67d92ac7b7
Remove /statusnet/config
2020-06-29 17:00:37 +04:00
Egor Kislitsyn
8693e01799
Fix warning
2020-06-29 16:29:51 +04:00
Egor Kislitsyn
4a306720e8
Merge branch 'develop' into remove-twitter-api
2020-06-29 16:09:49 +04:00
lain
59540131c1
Credo fixes.
2020-06-29 14:09:03 +02:00
lain
f308196b75
Token Response: Remove empty file.
2020-06-29 13:52:50 +02:00
lain
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
lain
bb168ed94a
OAuth: Extract view-type functions to a view.
2020-06-29 13:39:09 +02:00
lain
8630a6c7f5
Preloaders: Use strings as keys.
2020-06-29 11:41:00 +02:00
lain
a19f8778af
User preloader: Put user info at correct key
2020-06-29 11:06:20 +02:00
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
2020-06-29 08:39:51 +00:00
Haelwenn (lanodan) Monnier
9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
2020-06-29 03:31:33 +02:00
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
Haelwenn
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
2020-06-26 17:41:00 +00:00
Haelwenn
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
2020-06-26 16:59:46 +00:00
Mark Felder
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
Mark Felder
b950fb01db
Merge branch 'develop' into refactor/notification_settings
2020-06-26 10:23:19 -05:00
lain
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
lain
a2002ebb63
Preloading: Fix nodeinfo url.
2020-06-26 14:48:23 +02:00
lain
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
2020-06-26 14:47:38 +02:00
lain
7ed2296416
Nodeinfo: Add chat information back in.
2020-06-26 13:04:15 +02:00
lain
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
2020-06-26 12:06:00 +02:00
lain
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
2020-06-26 11:58:40 +02:00
Haelwenn (lanodan) Monnier
27c33f216a
activity_draft: Add source field
2020-06-26 05:48:25 +02:00
Haelwenn (lanodan) Monnier
d6c958b4c2
nodeinfo: Fix MRF transparency
2020-06-26 05:33:59 +02:00
feld
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
2020-06-25 21:35:39 +00:00
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
2020-06-25 12:40:39 +02:00
lain
84f9ca1956
Blocking: Don't federate if the options is set.
2020-06-25 12:03:14 +02:00
lain
44bb7cfccd
ActivityPub: Remove block
.
2020-06-25 11:51:33 +02:00
lain
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
lain
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
2020-06-25 11:33:54 +02:00
lain
89e5b2046b
ObjectValidator: Basic Block
support.
2020-06-25 11:13:35 +02:00
lain
4c5fb831b3
Status schema: Add parent_visible.
2020-06-24 14:33:00 +02:00
lain
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
lain
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
lain
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
2020-06-23 18:10:33 +00:00
Roman Chvanikov
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
lain
aee815b478
ObjectValidator: Clarify type of object.
2020-06-23 12:37:05 +02:00
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
Haelwenn (lanodan) Monnier
c116b6d6d6
ActivityPubController: Update upload_media @doc
...
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
2020-06-23 04:42:44 +02:00
Haelwenn
d21ef5e66b
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
...
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
2020-06-23 01:55:33 +00:00
Mark Felder
df5e048cbb
Do not need a function to provide fallback value with default defined in config.exs
2020-06-22 17:39:02 -05:00
Haelwenn
98f014d3be
Merge branch 'warning/mastofe-settings-blob' into 'develop'
...
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
2020-06-22 21:59:21 +00:00
Haelwenn (lanodan) Monnier
8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob
2020-06-22 23:45:29 +02:00
lain
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
2020-06-22 15:40:09 +00:00
Egor Kislitsyn
b3a549e916
Update NotificationOperation spec
2020-06-22 19:18:33 +04:00
Egor Kislitsyn
7e6f43c0d7
Add is_muted
to notifications
2020-06-22 19:03:04 +04:00
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
lain
8b5bdd164e
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
...
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
2020-06-22 12:25:12 +00:00
lain
b05f795326
Credo fixes
2020-06-22 14:02:29 +02:00
lain
e785cd5cae
ActivityPub: Remove update
and switch to pipeline.
2020-06-22 13:59:45 +02:00
rinpatch
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
2020-06-22 11:34:07 +00:00
lain
9438f83f83
Transmogrifier: Handle Update
with the pipeline.
2020-06-22 13:16:05 +02:00
lain
31a4d42ce0
SideEffects: Handle user updating.
2020-06-22 13:15:37 +02:00
rinpatch
282f492cd5
Merge branch '1883-mrf-chat' into 'develop'
...
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
2020-06-22 10:00:13 +00:00
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
lain
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
2020-06-22 10:35:11 +02:00
Alexander Strizhakov
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 10:59:08 +00:00
Alexander Strizhakov
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
lain
31761340fe
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
...
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
2020-06-20 09:57:12 +00:00
lain
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 09:39:50 +00:00
lain
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
Haelwenn (lanodan) Monnier
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
2020-06-20 00:08:26 +02:00
feld
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
2020-06-19 20:38:22 +00:00
Sergey Suprunenko
ac0344dd24
Only accounts with Service actor_type are considered as bots
2020-06-19 21:19:00 +02:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
lain
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
2020-06-19 16:38:57 +02:00
lain
abdb540d45
ObjectValidators: Add basic UpdateValidator.
2020-06-19 15:30:30 +02:00
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
Alexander Strizhakov
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
Alexander Strizhakov
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
Maksim Pechnikov
4044f24e2e
fix test
2020-06-18 05:06:28 +03:00
Mark Felder
2731ea1334
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
2020-06-17 13:13:55 -05:00
Mark Felder
c08c9db0c1
Remove misleading is_ prefix from boolean function
2020-06-17 13:02:01 -05:00
Mark Felder
71a5d9bffb
Empty list as default
2020-06-17 12:54:02 -05:00
Mark Felder
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
lain
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
2020-06-17 15:53:24 +00:00
Egor Kislitsyn
d4b5a9730e
Remove poll
from notification_type
OpenAPI spec
2020-06-17 18:47:59 +04:00
Maksim
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:38 +00:00
Maksim
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:32 +00:00
Maksim
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
2020-06-17 12:56:30 +00:00
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Alexander Strizhakov
a77b0388f4
credo fix
2020-06-17 10:31:06 +03:00
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
2020-06-16 18:10:00 +00:00
href
39f7fc5b8e
Update majic & call plug before OpenApiSpex
2020-06-16 19:00:54 +02:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
stwf
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
Maksim Pechnikov
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
rinpatch
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
lain
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
lain
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
2020-06-12 16:52:52 -05:00
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
Egor Kislitsyn
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
2020-06-12 18:39:51 +04:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
lain
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
Maksim Pechnikov
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
Egor Kislitsyn
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04:00
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
lain
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 18:56:46 +00:00
rinpatch
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
2020-06-10 12:05:45 +00:00
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
lain
86fec45f40
ControllerHelper: Fix wrong comparison.
2020-06-10 11:09:45 +02:00
lain
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:12:29 +00:00
lain
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:35 +00:00
lain
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:26 +00:00
lain
1b746cfbbb
Merge branch 'add-url-to-admin-account-view' into 'develop'
...
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
2020-06-09 12:59:14 +00:00
Egor Kislitsyn
3dd1de61a7
Add url
field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
lain
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
lain
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
Haelwenn (lanodan) Monnier
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
...
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
2020-06-08 21:04:30 +02:00
Roman Chvanikov
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
lain
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
lain
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
lain
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
lain
801e668a97
ChatController: Add last_read_id
option to mark_as_read.
2020-06-07 15:38:33 +02:00
lain
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
2020-06-07 14:52:56 +02:00
lain
0365053c8d
AttachmentValidator: Check if the mime type is valid.
2020-06-07 09:19:00 +02:00
lain
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
lain
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +02:00
lain
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
2020-06-06 09:46:07 +02:00
Egor Kislitsyn
167812a3f2
Fix pagination
2020-06-05 23:18:29 +04:00
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
lain
f24d2f714f
Credo fixes
2020-06-05 17:18:48 +02:00
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
Haelwenn
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
Haelwenn
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-05 14:48:02 +00:00
lain
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
2020-06-05 16:47:02 +02:00
lain
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
lain
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +02:00
lain
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
2020-06-05 12:26:07 +02:00
lain
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
lain
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_*
functions options
2020-06-04 21:36:26 +04:00
lain
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
lain
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
minibikini
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
lain
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
Egor Kislitsyn
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
Egor Kislitsyn
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
stwf
5677b21e82
clean up
2020-06-03 17:24:35 -04:00
stwf
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
stwf
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
stwf
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
lain
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
lain
c020fd4352
ChatMessageReferenceView: Return read status as unread
.
2020-06-03 18:58:58 +02:00
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
lain
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
2020-06-03 16:45:04 +02:00
Haelwenn
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
2020-06-03 14:04:12 +00:00
lain
7f5c5b11a5
Chats: Remove unread
from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
lain
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
Egor Kislitsyn
8a43611e01
Use AdminAPI.StatusView in api/admin/users
2020-06-03 14:53:46 +04:00
lain
f3ccd50a33
ChatMessageReferences: Adjust views
2020-06-03 12:49:53 +02:00
lain
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
2020-06-02 16:30:03 +00:00
Egor Kislitsyn
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
Egor Kislitsyn
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
lain
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
lain
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
lain
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
lain
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
lain
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00:00
lain
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
lain
37542a9dfa
Activity: Remove notifications-related functions.
2020-06-02 14:22:16 +02:00
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
lain
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
2020-06-02 11:32:03 +00:00
lain
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
rinpatch
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
lain
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
2020-06-02 08:49:24 +00:00
lain
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 10:43:13 +02:00
Alexander Strizhakov
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
rinpatch
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
Alexander Strizhakov
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
Egor Kislitsyn
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
lain
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
lain
d4d4b92f75
TimelineController: Only return Create
in public timelines.
2020-06-01 13:17:56 +02:00
lain
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
Alex Gleason
954acdda20
Add account_activation_required
to /api/v1/instance
2020-05-31 11:36:49 -05:00
lain
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
lain
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
lain
2c9465cc51
SafeText: Let through basic html.
2020-05-30 12:17:18 +02:00
lain
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
Steven Fuchs
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
Ivan Tashkinov
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
Ivan Tashkinov
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
2020-05-30 08:51:38 +03:00
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
kPherox
de0e262839
Fix argument error in streamer
...
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
2020-05-30 00:31:18 +09:00
Haelwenn (lanodan) Monnier
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
2020-05-29 16:14:45 +02:00
Haelwenn (lanodan) Monnier
2c18830d0d
Bugfix: router: allow basic_auth for outbox
2020-05-29 16:14:45 +02:00
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
lain
3898dd69a6
SideEffects: Ensure a chat is present before streaming something out.
2020-05-29 16:05:02 +02:00
lain
767ce8b803
StreamerView: Actually send Chats, not ChatMessages.
2020-05-29 16:02:45 +02:00
lain
863c02b25d
SideEffects: Stream out chat messages.
2020-05-29 15:44:03 +02:00
lain
c86a88edec
Streamer: Add a chat message stream.
2020-05-29 15:24:41 +02:00
lain
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
2020-05-29 10:42:49 +00:00
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
kPherox
228ff3760e
Use User.is_internal_user?
instead
2020-05-29 19:07:05 +09:00
kPherox
9df5b1e6ae
Don't make relay announce notification
2020-05-29 19:06:38 +09:00
rinpatch
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
2020-05-29 09:46:31 +00:00
Egor Kislitsyn
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
2020-05-28 23:11:12 +04:00
Egor Kislitsyn
d1ee3527ef
Move config actions to AdminAPI.ConfigController
2020-05-28 22:23:15 +04:00
lain
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
Alex Gleason
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
Mark Felder
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
Mark Felder
95f6240889
Fix minor spelling error
2020-05-27 14:34:37 -05:00
rinpatch
8f6d428880
AccountView: Use mediaproxy URLs for emojis
...
Also use atom keys in emoji maps instead of binaries
Closes #1810
2020-05-27 19:44:02 +03:00
kPherox
48fd9be65a
Exclude post actor from to of relay announce
2020-05-27 23:51:15 +09:00
rinpatch
d35be02e70
Merge branch 'refactor-add-mention-step-one' into 'develop'
...
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
2020-05-27 14:17:12 +00:00
Alexander Strizhakov
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27 10:55:42 +00:00
Egor Kislitsyn
c6290be682
Fix typo
2020-05-27 14:42:21 +04:00
lain
b9e2678b9e
Merge branch 'fav-speedup' into 'develop'
...
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
2020-05-27 08:02:00 +00:00
lain
7e13200869
ActivityPub: Change ordering to nulls last
in favorites query
...
This makes it use our existing index and speeds up the query.
2020-05-27 09:46:12 +02:00
Alexander Strizhakov
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
lain
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
2020-05-26 13:45:54 +02:00
Egor Kislitsyn
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
Egor Kislitsyn
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
Egor Kislitsyn
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
Alexander Strizhakov
8f08384d80
another view for account in admin-fe status_show
2020-05-26 13:48:39 +03:00
Ivan Tashkinov
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
2020-05-25 23:27:47 +03:00
Egor Kislitsyn
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
2020-05-25 22:04:06 +04:00
lain
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
2020-05-25 17:27:45 +02:00
lain
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
2020-05-25 15:08:43 +02:00
Egor Kislitsyn
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
2020-05-25 16:51:16 +04:00
lain
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
lain
ec470c4c77
Merge branch 'openapi/admin/status' into 'develop'
...
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
2020-05-25 11:40:54 +00:00
rinpatch
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
2020-05-24 19:05:57 +00:00
lain
ddbbefeb2e
Merge branch 'feature/configure-filename-truncate' into 'develop'
...
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
2020-05-22 16:05:35 +00:00
Roman Chvanikov
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
2020-05-22 15:44:10 +00:00
Roman Chvanikov
cc82229ba7
Add filename_display_max_length config
2020-05-22 18:19:25 +03:00
lain
91c8467582
OStatusController: Add Mastodon activity compat route.
2020-05-22 17:11:59 +02:00
lain
355aa3bdc7
ActivityPubController: Add Mastodon activity compat route.
2020-05-22 17:06:12 +02:00
lain
8a4bd9e5d1
OStatusController: Add Mastodon compatibility route for objects.
2020-05-22 16:47:22 +02:00
rinpatch
1fa7aa9fc5
Merge branch 'emoji-react-better-errors' into 'develop'
...
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
2020-05-22 14:36:08 +00:00
Egor Kislitsyn
ba106aa9c8
Fix notifications mark as read API
2020-05-22 18:15:36 +04:00
lain
ca755f9a73
ActivityPubController: Add Mastodon compatibility route.
2020-05-22 16:15:29 +02:00
lain
bcb549531f
EmojiReactionController: Return more appropriate error.
2020-05-22 14:38:28 +02:00
Haelwenn
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
2020-05-22 05:47:53 +00:00
Haelwenn
a57e7f3503
Merge branch '1113-op-mentioning' into 'develop'
...
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
2020-05-22 05:22:07 +00:00
Ivan Tashkinov
610343edb3
[ #2497 ] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
2020-05-21 17:35:42 +03:00
lain
ab1154e13f
Merge branch 'admin-logo-upload' into 'develop'
...
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
2020-05-21 14:30:34 +00:00
lain
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
lain
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
lain
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
2020-05-21 13:30:09 +00:00
Egor Kislitsyn
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
lain
cdc6ba8d7b
AnnounceValidator: Check for announcability
2020-05-21 13:58:18 +02:00
lain
c76267afb9
Credo fixes.
2020-05-21 13:31:52 +02:00
lain
23e248694d
Announcements: Fix all tests.
2020-05-21 13:16:21 +02:00
lain
d9d425708e
SideEffects: Builed out Announce effects.
2020-05-21 12:43:09 +02:00
Egor Kislitsyn
9de9760aa6
Move status actions to AdminAPI.StatusController
2020-05-21 13:52:30 +04:00
eugenijm
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
2020-05-21 04:41:42 +03:00
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
Ivan Tashkinov
1871a5ddb4
[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
2020-05-20 20:26:43 +03:00
lain
39031f4860
Pipeline: Don't federate if federation is disabled.
2020-05-20 16:36:55 +02:00
lain
e42bc5f557
Announcements: Handle through common pipeline.
2020-05-20 15:44:37 +02:00
lain
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
2020-05-20 12:08:28 +00:00
lain
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
2020-05-20 14:02:40 +02:00
lain
eb5f428565
CommonAPI: Change public->private implicit addressing.
...
This will not add the OP to the `to` field anymore when going from
public to private.
2020-05-20 13:38:47 +02:00
Egor Kislitsyn
26f01744bc
Add background_image
to InstanceOperation
2020-05-20 15:18:58 +04:00
Egor Kislitsyn
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
2020-05-20 15:15:13 +04:00
Egor Kislitsyn
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
2020-05-20 15:15:13 +04:00
Egor Kislitsyn
9a5de0f454
Move reaction actions to EmojiReactionController
2020-05-20 15:15:13 +04:00
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
2020-05-20 10:53:54 +00:00
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
2020-05-20 10:35:36 +00:00
lain
8a6ddf26ac
InstanceOperation: Add background image to example
2020-05-20 12:12:07 +02:00
Egor Kislitsyn
47ed9ee441
Fix summary
2020-05-19 17:29:58 +04:00
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView
2020-05-19 16:26:06 +04:00
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
2020-05-19 16:26:06 +04:00
Egor Kislitsyn
e4c720f14c
Fix typo
2020-05-19 14:59:50 +04:00
Haelwenn
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
2020-05-19 09:41:57 +00:00
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
2020-05-19 09:42:41 +03:00
Maksim Pechnikov
5f0a3ac74d
added tests
2020-05-19 06:05:09 +03:00
lain
d19c716770
AttachmentValidator: Handle empty mediatypes
2020-05-18 20:17:28 +02:00
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController
2020-05-18 22:01:18 +04:00
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
2020-05-18 20:58:59 +04:00
lain
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
2020-05-18 18:45:33 +02:00
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-18 18:38:32 +02:00
Ivan Tashkinov
5735b5c8be
Fixed missing support for with_muted
param in direct timeline.
2020-05-18 19:00:00 +03:00
Egor Kislitsyn
aef31c69df
Rename EmojiAPIController to EmojiPackController
2020-05-18 19:43:25 +04:00
Egor Kislitsyn
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
2020-05-18 19:43:23 +04:00
Egor Kislitsyn
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
2020-05-18 19:28:46 +04:00
lain
0d5bce018d
AnnounceValidator: Validate for existing announce
2020-05-18 16:54:10 +02:00
lain
17a8342c1e
ObjectValidators: Add basic Announce validator.
2020-05-18 16:45:11 +02:00
lain
7d381b16b7
Transmogrifier Test: Extract Announce handling.
2020-05-18 14:48:37 +02:00
Alexander Strizhakov
215daabdb4
copyright update
2020-05-18 15:15:51 +03:00
lain
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
2020-05-18 13:29:30 +02:00
lain
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
2020-05-18 10:57:59 +00:00
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
Alexander Strizhakov
1671864d88
return :visible instead of boolean
2020-05-18 10:34:50 +03:00
Alexander Strizhakov
b1aa402229
removing 410 status
2020-05-18 10:34:50 +03:00
Alexander Strizhakov
e7bc2f980c
account visibility
2020-05-18 10:34:49 +03:00
Ivan Tashkinov
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18 09:51:53 +03:00
Maksim Pechnikov
c33a4315fb
updated docs
2020-05-18 06:48:19 +03:00
lain
baf051a59e
SideEffects: Don't update unread count for actor in chatmessages.
2020-05-17 12:22:26 +02:00
lain
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-17 12:14:49 +02:00
lain
8bfd9710ae
Pleroma Authenticator: Also update passwords here.
2020-05-17 11:53:17 +02:00
lain
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
Ivan Tashkinov
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
2020-05-17 08:46:43 +03:00
Maksim Pechnikov
3f8d68bdf3
added example cache purge script
2020-05-17 05:56:20 +03:00
lain
d96f8f17e8
Merge branch 'features/mastoapi_v2_media' into 'develop'
...
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
2020-05-16 17:13:38 +00:00
lain
d15aa9d950
Merge branch 'develop' into 'remove-twitter-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2020-05-16 17:07:09 +00:00
Ivan Tashkinov
978ccf8f97
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-16 16:14:50 +03:00
lain
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
2020-05-16 12:28:24 +02:00
Maksim Pechnikov
cb40602a16
added media proxy invalidation
2020-05-15 21:39:42 +03:00
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
lain
1d18721a3c
Chats: Add updated_at to Schema and docs.
2020-05-15 13:18:41 +02:00
Egor Kislitsyn
e090191d03
[OpenAPI] Mark all not required request fields as nullable
2020-05-15 14:55:41 +04:00
Ivan Tashkinov
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-05-14 20:19:56 +03:00
Ivan Tashkinov
f1f588fd52
[ #2497 ] Added support for :eimp for image resizing.
2020-05-14 20:18:31 +03:00
rinpatch
e455ca3f3e
Merge branch 'feature/database-configuration-whitelist' into 'develop'
...
Database configuration whitelist
See merge request pleroma/pleroma!2522
2020-05-14 16:07:37 +00:00
lain
4157c459b8
Merge branch 'bcrypt-auth' into 'develop'
...
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
2020-05-14 14:36:56 +00:00
Alex Gleason
5b0f27d23d
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
2020-05-14 08:57:38 -05:00
Egor Kislitsyn
bb03dfdb03
Do not require description
in update
action
2020-05-14 16:29:32 +04:00
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec
2020-05-14 16:18:30 +04:00
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups
2020-05-14 12:43:53 +01:00
lain
3342846ac2
ChatView: Add update_at field.
2020-05-14 13:20:28 +02:00
Steph
5c6f575315
Style fixes
2020-05-14 12:15:48 +01:00
Haelwenn (lanodan) Monnier
099e314a1b
Add OpenAPISpex for MediaController
2020-05-14 12:13:25 +02:00
lain
359d7b0a6d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:09:11 +00:00
lain
1c2629328d
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14 09:07:09 +00:00
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints
2020-05-14 10:14:28 +02:00
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
Roman Chvanikov
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
Ivan Tashkinov
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for with_relationships
param in GET /api/v1/accounts/search
.
2020-05-13 18:56:45 +03:00
Egor Kislitsyn
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
2020-05-13 19:06:46 +04:00
lain
0f0acc740d
Chat: Allow posting without content if an attachment is present.
2020-05-13 15:31:28 +02:00
Ivan Tashkinov
59b6d5f2aa
[ #2456 ] Changed embed_relationships
param to with_relationships
.
2020-05-13 15:08:07 +03:00
lain
06cad239e5
InstanceView: Add pleroma chat messages to nodeinfo
2020-05-13 14:05:22 +02:00
lain
3cff4e24cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-13 12:44:16 +02:00
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController
2020-05-13 14:15:24 +04:00
Ivan Tashkinov
33b798425f
[ #2456 ] Post-merge fix.
2020-05-13 12:50:52 +03:00
Ivan Tashkinov
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
2020-05-13 12:42:36 +03:00
lain
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
lain
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Egor Kislitsyn
79ad12064d
Fix format
2020-05-13 01:59:17 +04:00
minibikini
cb1a3e196c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:43 +00:00
minibikini
5a2333925c
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:36 +00:00
minibikini
822e9c09aa
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:23:21 +00:00
minibikini
40646a7e0e
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:14:52 +00:00
minibikini
0bb164a3e1
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:12:22 +00:00
minibikini
648cc0d72d
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
2020-05-12 21:09:26 +00:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
2020-05-13 00:25:21 +04:00
Stephanie Wilde-Hobbs
a2fcfc78c9
Filter config descriptions by config whitelist
2020-05-12 21:07:33 +01:00
Ivan Tashkinov
bfb48e3db6
[ #2456 ] OpenAPI: added embed_relationships
param definition.
2020-05-12 20:55:01 +03:00
rinpatch
2b18b8a263
Merge branch 'streamer-get-topic' into 'develop'
...
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
rinpatch
24c8c13640
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
...
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
Ivan Tashkinov
63a1a82f38
[ #2456 ] Added support for embed_relationships
param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12 19:14:35 +03:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist
2020-05-12 17:12:27 +01:00
href
e6d8cacf2d
Expand and authorize streams in Streamer directly
2020-05-12 18:04:47 +02:00
lain
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
2020-05-12 16:43:04 +02:00
lain
ec72cba43e
Chat Controller: Add basic error handling.
2020-05-12 13:23:09 +02:00
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
lain
b5aa204eb8
ChatController: Support deletion of chat messages.
2020-05-12 13:13:03 +02:00
lain
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
2020-05-12 12:29:37 +02:00
lain
d0ba1844b0
ActivityPub: Fix non-federating blocks.
2020-05-12 10:52:46 +02:00
rinpatch
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
Ivan Tashkinov
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
2020-05-11 23:21:53 +03:00
lain
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-11 17:14:58 +02:00
href
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +02:00
lain
5367a00257
Deletion: Handle the case of pruned objects.
2020-05-11 15:06:23 +02:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
lain
8d5597ff68
ChatController: Add GET /chats/:id
2020-05-10 13:26:14 +02:00
lain
172d9b1193
Chat: Add last_message to schema.
2020-05-10 13:08:01 +02:00
lain
f335e1404a
ChatView: Add the last message to the view.
2020-05-10 13:00:01 +02:00
lain
1054e89762
ChatOperation: Add media id to example
2020-05-10 12:30:24 +02:00
Ivan Tashkinov
b960a9430d
[ #2456 ] credo fix.
2020-05-10 09:35:12 +03:00
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
Ivan Tashkinov
ac4250a18c
[ #2456 ] Clarified skip_relationships
option (and its default of false
) for MastodonAPI.AccountView.
2020-05-09 19:03:07 +03:00
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded pleroma/account/relationship
in statuses and notifications.
2020-05-09 18:05:44 +03:00
Roman Chvanikov
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
Roman Chvanikov
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
Ivan Tashkinov
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
2020-05-08 23:06:47 +03:00
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
lain
03529f6a05
Transmogrifier: Don't modify attachments for chats.
2020-05-08 18:26:35 +02:00
lain
d0bf8cfb8f
Credo fixes.
2020-05-08 14:11:58 +02:00
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
lain
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
2020-05-08 10:41:41 +00:00
Maksim Pechnikov
4d71c4b805
fixed 'source' object in verify_credentials
2020-05-08 12:35:34 +03:00
lain
6acbe45eb2
Builder: Extract common features of likes and reactions.
2020-05-08 11:30:31 +02:00
lain
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
2020-05-08 09:23:01 +00:00
lain
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
...
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
2020-05-08 09:04:24 +00:00
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
Haelwenn
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
...
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
2020-05-07 22:29:16 +00:00
lain
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 18:53:34 +02:00
rinpatch
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
2020-05-07 14:28:10 +00:00
lain
516ff945ce
Merge branch 'openapi/search' into 'develop'
...
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
2020-05-07 13:38:34 +00:00
rinpatch
eb1f2fcbc6
Streamer: Fix wrong argument order when rendering activities to authenticated user
...
Closes #1747
2020-05-07 16:13:24 +03:00
lain
d11eea62b1
Credo fixes
2020-05-07 15:09:37 +02:00
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
lain
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
2020-05-07 15:03:12 +02:00
lain
788b7e7bbd
Merge fixes.
2020-05-07 14:52:37 +02:00
lain
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
2020-05-07 14:45:20 +02:00
lain
3f867d8e9b
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
2020-05-07 10:48:09 +00:00
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController
2020-05-07 14:04:48 +04:00
Egor Kislitsyn
cdca62e8d4
Add schema for Tag
2020-05-07 14:04:07 +04:00
lain
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
2020-05-07 09:19:45 +00:00
lain
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
2020-05-07 09:13:32 +00:00
href
9491ba3e49
Streamer rework
2020-05-07 09:13:32 +00:00
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
Mark Felder
a2580adc91
Hide the sender when privacy option is enabled
2020-05-06 16:42:27 -05:00
Mark Felder
57736c1833
Privacy option affects all push notifications, not just Direct Messages
2020-05-06 16:30:05 -05:00
lain
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 17:36:08 +02:00
rinpatch
473b0d9f3d
Merge branch 'feature/delete-validator' into 'develop'
...
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
2020-05-06 14:32:58 +00:00
lain
fc9d0b6eec
Credo fixes.
2020-05-06 16:31:21 +02:00
lain
20baa2eaf0
ChatMessages: Add attachments.
2020-05-06 16:12:36 +02:00
Maksim Pechnikov
bd261309cc
added unread_notifications_count
for /api/v1/accounts/verify_credentials
2020-05-06 15:08:38 +03:00
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
Egor Kislitsyn
06c69c0a0a
Fix description
2020-05-06 14:18:19 +04:00
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
lain
07e7c80bc9
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
...
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
2020-05-06 09:14:05 +00:00
lain
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
lain
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
lain
c3f1ce80eb
Merge branch 'fix/1726-user-pagination' into 'develop'
...
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
2020-05-06 09:01:42 +00:00
lain
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
lain
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
lain
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
lain
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
lain
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
lain
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
Egor Kislitsyn
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
Egor Kislitsyn
6ba25d1197
Add Attachment schema
2020-05-05 23:42:24 +04:00
Egor Kislitsyn
0a1394cc1a
Add OpenAPI spec for PollController
2020-05-05 20:14:22 +04:00
lain
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
2020-05-05 18:02:24 +02:00
lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
2020-05-05 16:42:34 +02:00
lain
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
2020-05-05 16:17:09 +02:00
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
2020-05-05 17:44:46 +04:00
Egor Kislitsyn
32ca9f2c59
Render mastodon-like errors in FilterController
2020-05-05 17:41:16 +04:00
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
2020-05-05 17:41:01 +04:00
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
2020-05-05 17:41:01 +04:00
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
2020-05-05 17:40:00 +04:00
minibikini
42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
minibikini
3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
minibikini
b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
2020-05-05 17:24:40 +04:00
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
2020-05-05 17:24:16 +04:00