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
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02: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
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
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