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
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
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
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
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
2020-07-14 11:04:16 +02:00
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
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
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
ce243b107f
Use Logger.info for {:reject, reason}
2020-07-13 15:26:31 +02:00
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
e4e5577818
Prevent unapproved users from logging in
2020-07-12 22:55:26 -05:00
51ab8d0128
Add `account_approval_required` instance setting
2020-07-12 20:27:58 -05:00
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
2020-07-12 17:23:33 +02:00
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
62fc8eab0d
fix reset confirmation email in admin section
2020-07-11 07:20:35 +03:00
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
2020-07-10 14:10:44 +02:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
2020-07-10 08:55:15 +00:00
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
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
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
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
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
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
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
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
2020-07-08 17:07:24 +02:00
9dda8b5427
CommonAPI: Switch to pipeline for following.
2020-07-08 15:40:56 +02:00
172f4aff8e
Transmogrifier: Move following to the pipeline.
2020-07-08 14:30:53 +02:00
7d0e2b3fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
2020-07-08 13:23:07 +02:00
cdc153db31
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
2020-07-08 13:21:58 +02:00
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
a6495f4a68
[ #1895 ] credo fix.
2020-07-08 12:54:23 +03:00
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
3f8370a285
[ #1895 ] Applied code review suggestion.
2020-07-08 12:36:44 +03:00
e341f81785
fixed delete `Like` activity in remove user
2020-07-08 09:06:23 +03:00
31fef95e35
Add changelog and documentation
2020-07-08 06:29:24 +02:00
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
2020-07-08 06:28:40 +02:00
013e2c5057
Use instances table instead of Cachex
2020-07-08 06:28:39 +02:00
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
2020-07-08 06:28:39 +02:00
f6d09fafee
Add support for remote favicons
2020-07-08 06:28:39 +02:00
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
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
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
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
2020-07-07 20:37:11 +03:00
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
2020-07-07 11:21:05 -05:00
c8dd973af5
AccountController: Remove unused `update_?` routes.
...
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
59cf78e412
AccountController: Allow removal / reset of user images.
2020-07-07 16:53:03 +02:00
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
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
fbb9743a70
Fix getting videos from peertube
2020-07-07 09:38:38 +02:00
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
a6a12b241f
FollowValidator: Add basic validation.
2020-07-06 15:57:19 +02:00
28feba8af4
Preloaders: Remove status_net preloader
2020-07-06 12:24:45 +02:00
1963e143c5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
2020-07-06 12:15:59 +02:00
208baf157a
ActivityPub: Add new 'capabilities' to user.
2020-07-06 11:38:40 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
cc8b4e48d9
InstanceView: Add chat limit, description limit
2020-07-06 11:12:37 +02:00
20c27bef40
renaming back and reject nil on create
2020-07-06 09:30:42 +03:00
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +03:00
fc1f34b851
Delete activity before sending response to client
2020-07-06 00:01:25 +03:00
9faa632037
[ #2497 ] Fixed merge issue.
2020-07-05 19:02:43 +03:00
cf56655614
Streamer: Don't filter out announce notifications.
2020-07-04 17:11:37 +02:00
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
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
945e75c8e8
SearchController: Trim query.
2020-07-03 16:36:55 +02:00
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
4a7b89e372
ChatMessageValidator: Additional validation.
2020-07-03 15:13:27 +02:00
3ca9af1f9f
Account Schema: Add `accepts_chat_messages`
2020-07-03 14:31:04 +02:00
5c0bf4c472
ActivityPub: Ingest information about chat acceptance.
2020-07-03 13:58:34 +02:00
26a7cc3f00
UserView: Add acceptsChatMessages field
2020-07-03 13:38:59 +02:00
3250228be9
AccountView: Add 'accepts_chat_messages' to view.
2020-07-03 13:07:33 +02:00
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
d44ec2bf4c
Remove camelCase from the keys
2020-07-02 12:55:08 -05:00
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
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
bad08f34ca
Credo fixes.
2020-07-02 09:57:31 +02:00
311b7c19d0
Streamer: Align announce streaming with polling.
2020-07-02 09:50:26 +02:00
61fe94d698
SideEffects: Refactor.
2020-07-02 09:33:50 +02:00
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
ce92e6e5ce
Fetcher: Work when we can't get the OP.
2020-07-01 11:48:51 +02:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
5a8e0208b1
Add fields limits to instance metadata, add tests
2020-06-30 15:25:10 -05:00
0883a706dc
Merge branch 'develop' into activation-meta
2020-06-30 15:09:03 -05:00
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
8b7055e25e
Credo fixes
2020-06-30 11:55:58 +02:00
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
2020-06-30 11:40:34 +02:00
2382a2a151
Preload: Load the correct instance panel
2020-06-30 11:35:54 +02:00
979f02ec94
Fix CastAndValidate plug
2020-06-29 17:33:00 +04:00
67d92ac7b7
Remove `/statusnet/config`
2020-06-29 17:00:37 +04:00
8693e01799
Fix warning
2020-06-29 16:29:51 +04:00
4a306720e8
Merge branch 'develop' into remove-twitter-api
2020-06-29 16:09:49 +04:00
59540131c1
Credo fixes.
2020-06-29 14:09:03 +02:00
f308196b75
Token Response: Remove empty file.
2020-06-29 13:52:50 +02:00
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
bb168ed94a
OAuth: Extract view-type functions to a view.
2020-06-29 13:39:09 +02:00
8630a6c7f5
Preloaders: Use strings as keys.
2020-06-29 11:41:00 +02:00
a19f8778af
User preloader: Put user info at correct key
2020-06-29 11:06:20 +02:00
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
9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
2020-06-29 03:31:33 +02:00
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
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
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
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
b950fb01db
Merge branch 'develop' into refactor/notification_settings
2020-06-26 10:23:19 -05:00
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
a2002ebb63
Preloading: Fix nodeinfo url.
2020-06-26 14:48:23 +02:00
4a7a34ae8c
Preloading: Return correct data for statusnet stuff.
2020-06-26 14:47:38 +02:00
7ed2296416
Nodeinfo: Add chat information back in.
2020-06-26 13:04:15 +02:00
15a8b70318
User: Don't unfollow on block when the relevant setting is set.
2020-06-26 12:06:00 +02:00
c3383d4fab
BlockValidator: Restore old behavior for incoming blocks.
2020-06-26 11:58:40 +02:00
27c33f216a
activity_draft: Add source field
2020-06-26 05:48:25 +02:00
d6c958b4c2
nodeinfo: Fix MRF transparency
2020-06-26 05:33:59 +02:00
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
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
04abee782b
AntiSpamLinkPolicy: Exempt local users.
2020-06-25 12:40:39 +02:00
84f9ca1956
Blocking: Don't federate if the options is set.
2020-06-25 12:03:14 +02:00
44bb7cfccd
ActivityPub: Remove `block`.
2020-06-25 11:51:33 +02:00
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
e38293c8f1
Transmogrifier: Switch to pipeline for Blocks.
2020-06-25 11:33:54 +02:00
89e5b2046b
ObjectValidator: Basic `Block` support.
2020-06-25 11:13:35 +02:00
4c5fb831b3
Status schema: Add parent_visible.
2020-06-24 14:33:00 +02:00
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
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
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
2020-06-23 18:10:33 +00:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
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
aee815b478
ObjectValidator: Clarify type of object.
2020-06-23 12:37:05 +02:00
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
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
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
df5e048cbb
Do not need a function to provide fallback value with default defined in config.exs
2020-06-22 17:39:02 -05:00
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
8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob
2020-06-22 23:45:29 +02:00
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
b3a549e916
Update NotificationOperation spec
2020-06-22 19:18:33 +04:00
7e6f43c0d7
Add `is_muted` to notifications
2020-06-22 19:03:04 +04:00
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
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
b05f795326
Credo fixes
2020-06-22 14:02:29 +02:00
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
2020-06-22 13:59:45 +02:00
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
9438f83f83
Transmogrifier: Handle `Update` with the pipeline.
2020-06-22 13:16:05 +02:00
31a4d42ce0
SideEffects: Handle user updating.
2020-06-22 13:15:37 +02:00
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
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
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
2020-06-22 10:35:11 +02:00
b5f13af7ba
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 10:59:08 +00:00
c5863438ba
proper error codes for error in adminFE
2020-06-20 13:53:57 +03:00
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
0e789bc55f
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
2020-06-20 09:39:50 +00:00
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
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
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
ac0344dd24
Only accounts with Service actor_type are considered as bots
2020-06-19 21:19:00 +02:00
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
75670a99e4
UpdateValidator: Only allow updates from the user themselves.
2020-06-19 16:38:57 +02:00
abdb540d45
ObjectValidators: Add basic UpdateValidator.
2020-06-19 15:30:30 +02:00
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
02ca8a363f
default page size for files
2020-06-19 14:46:38 +03:00
3e3f9253e6
adding overall count for packs and files
2020-06-19 10:17:24 +03:00
4975ed86bc
emoji pagination for pack show action
2020-06-18 18:50:03 +03:00
3becdafd33
emoji packs pagination
2020-06-18 14:32:21 +03:00
4044f24e2e
fix test
2020-06-18 05:06:28 +03:00
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
c08c9db0c1
Remove misleading is_ prefix from boolean function
2020-06-17 13:02:01 -05:00
71a5d9bffb
Empty list as default
2020-06-17 12:54:02 -05:00
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
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
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
2020-06-17 18:47:59 +04:00
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:38 +00:00
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:32 +00:00
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
2020-06-17 12:56:30 +00:00
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
a77b0388f4
credo fix
2020-06-17 10:31:06 +03:00
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
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
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
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
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
26f710b9e3
Merge branch 'develop' into preload-data
2020-06-12 16:52:52 -05:00
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
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
2020-06-12 18:39:51 +04:00
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
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
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 18:56:46 +00:00
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
2020-06-10 12:05:45 +00:00
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
86fec45f40
ControllerHelper: Fix wrong comparison.
2020-06-10 11:09:45 +02:00
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:12:29 +00:00
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:35 +00:00
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:26 +00:00
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
3dd1de61a7
Add `url` field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
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
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
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
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
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
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
2020-06-07 15:38:33 +02:00
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
2020-06-07 14:52:56 +02:00
0365053c8d
AttachmentValidator: Check if the mime type is valid.
2020-06-07 09:19:00 +02:00
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
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
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +02:00
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
2020-06-06 09:46:07 +02:00
167812a3f2
Fix pagination
2020-06-05 23:18:29 +04:00
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
f24d2f714f
Credo fixes
2020-06-05 17:18:48 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
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
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
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
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +02:00
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
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
2020-06-04 21:36:26 +04:00
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
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
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
5677b21e82
clean up
2020-06-03 17:24:35 -04:00
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
c020fd4352
ChatMessageReferenceView: Return read status as `unread`.
2020-06-03 18:58:58 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
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
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
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
8a43611e01
Use AdminAPI.StatusView in api/admin/users
2020-06-03 14:53:46 +04:00
f3ccd50a33
ChatMessageReferences: Adjust views
2020-06-03 12:49:53 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
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
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
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
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
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
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
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
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
37542a9dfa
Activity: Remove notifications-related functions.
2020-06-02 14:22:16 +02:00
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
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
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
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
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 10:43:13 +02:00
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
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
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
2020-06-01 13:17:56 +02:00
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
954acdda20
Add `account_activation_required` to /api/v1/instance
2020-05-31 11:36:49 -05:00
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
2c9465cc51
SafeText: Let through basic html.
2020-05-30 12:17:18 +02:00
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
2020-05-30 08:51:38 +03:00
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
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
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
2020-05-29 16:14:45 +02:00
2c18830d0d
Bugfix: router: allow basic_auth for outbox
2020-05-29 16:14:45 +02:00
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
3898dd69a6
SideEffects: Ensure a chat is present before streaming something out.
2020-05-29 16:05:02 +02:00
767ce8b803
StreamerView: Actually send Chats, not ChatMessages.
2020-05-29 16:02:45 +02:00
863c02b25d
SideEffects: Stream out chat messages.
2020-05-29 15:44:03 +02:00
c86a88edec
Streamer: Add a chat message stream.
2020-05-29 15:24:41 +02:00
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
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
228ff3760e
Use `User.is_internal_user?` instead
2020-05-29 19:07:05 +09:00
9df5b1e6ae
Don't make relay announce notification
2020-05-29 19:06:38 +09:00
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
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
2020-05-28 23:11:12 +04:00
d1ee3527ef
Move config actions to AdminAPI.ConfigController
2020-05-28 22:23:15 +04:00
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
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
95f6240889
Fix minor spelling error
2020-05-27 14:34:37 -05:00
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
48fd9be65a
Exclude post actor from to of relay announce
2020-05-27 23:51:15 +09:00
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
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27 10:55:42 +00:00
c6290be682
Fix typo
2020-05-27 14:42:21 +04:00
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
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
3249141588
validate actor type
2020-05-27 10:14:22 +03:00
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
2020-05-26 13:45:54 +02:00
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
2020-05-26 15:03:07 +04:00
8f08384d80
another view for account in admin-fe status_show
2020-05-26 13:48:39 +03:00
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
2020-05-25 23:27:47 +03:00
0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
2020-05-25 22:04:06 +04:00
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
2020-05-25 17:27:45 +02:00
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
2020-05-25 15:08:43 +02:00
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
2020-05-25 16:51:16 +04:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
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
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
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
5d60b25e69
Apply suggestion to lib/pleroma/web/common_api/utils.ex
2020-05-22 15:44:10 +00:00
cc82229ba7
Add filename_display_max_length config
2020-05-22 18:19:25 +03:00
91c8467582
OStatusController: Add Mastodon activity compat route.
2020-05-22 17:11:59 +02:00
355aa3bdc7
ActivityPubController: Add Mastodon activity compat route.
2020-05-22 17:06:12 +02:00
8a4bd9e5d1
OStatusController: Add Mastodon compatibility route for objects.
2020-05-22 16:47:22 +02:00
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
ba106aa9c8
Fix notifications mark as read API
2020-05-22 18:15:36 +04:00
ca755f9a73
ActivityPubController: Add Mastodon compatibility route.
2020-05-22 16:15:29 +02:00
bcb549531f
EmojiReactionController: Return more appropriate error.
2020-05-22 14:38:28 +02:00
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
2020-05-22 05:47:53 +00:00
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
610343edb3
[ #2497 ] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
2020-05-21 17:35:42 +03:00
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
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:35:13 +02:00
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
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
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
2020-05-21 17:23:12 +04:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
cdc6ba8d7b
AnnounceValidator: Check for announcability
2020-05-21 13:58:18 +02:00
c76267afb9
Credo fixes.
2020-05-21 13:31:52 +02:00
23e248694d
Announcements: Fix all tests.
2020-05-21 13:16:21 +02:00
d9d425708e
SideEffects: Builed out Announce effects.
2020-05-21 12:43:09 +02:00
9de9760aa6
Move status actions to AdminAPI.StatusController
2020-05-21 13:52:30 +04:00
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
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
1871a5ddb4
[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
2020-05-20 20:26:43 +03:00
39031f4860
Pipeline: Don't federate if federation is disabled.
2020-05-20 16:36:55 +02:00
e42bc5f557
Announcements: Handle through common pipeline.
2020-05-20 15:44:37 +02:00
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
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
2020-05-20 14:02:40 +02:00
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
26f01744bc
Add `background_image` to `InstanceOperation`
2020-05-20 15:18:58 +04:00
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
2020-05-20 15:15:13 +04:00
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
2020-05-20 15:15:13 +04:00
9a5de0f454
Move reaction actions to EmojiReactionController
2020-05-20 15:15:13 +04:00
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
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
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
8a6ddf26ac
InstanceOperation: Add background image to example
2020-05-20 12:12:07 +02:00
47ed9ee441
Fix summary
2020-05-19 17:29:58 +04:00
6609714d66
Move Scrobble views to ScrobbleView
2020-05-19 16:26:06 +04:00
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
2020-05-19 16:26:06 +04:00
e4c720f14c
Fix typo
2020-05-19 14:59:50 +04:00
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
41f8f17260
fix api/v1/accounts/update_credentials
2020-05-19 09:42:41 +03:00
5f0a3ac74d
added tests
2020-05-19 06:05:09 +03:00
d19c716770
AttachmentValidator: Handle empty mediatypes
2020-05-18 20:17:28 +02:00
fe5d423b43
Add OpenAPI spec for MascotController
2020-05-18 22:01:18 +04:00
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
2020-05-18 20:58:59 +04:00
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
2020-05-18 18:45:33 +02:00
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-18 18:38:32 +02:00
5735b5c8be
Fixed missing support for `with_muted` param in direct timeline.
2020-05-18 19:00:00 +03:00
aef31c69df
Rename EmojiAPIController to EmojiPackController
2020-05-18 19:43:25 +04:00
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
2020-05-18 19:43:23 +04:00
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
2020-05-18 19:28:46 +04:00
0d5bce018d
AnnounceValidator: Validate for existing announce
2020-05-18 16:54:10 +02:00
17a8342c1e
ObjectValidators: Add basic Announce validator.
2020-05-18 16:45:11 +02:00
7d381b16b7
Transmogrifier Test: Extract Announce handling.
2020-05-18 14:48:37 +02:00
215daabdb4
copyright update
2020-05-18 15:15:51 +03:00
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
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
feld