rinpatch
975482f091
insert object defaults for fake activities and make credo happy
6 years ago
rinpatch
d866b59eea
oof
6 years ago
rinpatch
45ba10bf47
Fix the issue with HTML scrubber
6 years ago
Ivan Tashkinov
804173fc92
[ #923 ] Minor code readability fix.
6 years ago
Ivan Tashkinov
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
rinpatch
cd387f8693
Add a fake option to lazy_put_actvity_defaults
6 years ago
rinpatch
1bb4d5d65b
Implement fake status submit
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
Alex S
3ca6c4f443
password reset page labels align
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
rinpatch
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
6 years ago
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
rinpatch
406d19331f
Remove ActivityRepresenter
6 years ago
Ivan Tashkinov
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov
b0759f821b
Comments split.
6 years ago
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
Mark Felder
c410296120
Try sending an empty map
6 years ago
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
kaniini
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
6 years ago
rinpatch
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
rinpatch
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
6 years ago
Haelwenn (lanodan) Monnier
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
William Pitcock
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
William Pitcock
8c70156157
activitypub: object view: use preloaded object when possible
6 years ago
William Pitcock
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
William Pitcock
07cdd9ed02
streamer: use the preloaded object if possible
6 years ago
William Pitcock
c62220c500
rich media: helpers: only crawl Create activities
6 years ago
William Pitcock
4cedf45423
relay: use preloaded object since we always have it
6 years ago
William Pitcock
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
6 years ago
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
William Pitcock
ba7299fc87
activitypub: add missing with_preloaded_object()
6 years ago
William Pitcock
e4307cadc8
activitypub: splice in the child object if we have one
6 years ago
William Pitcock
a6973a668e
formatting
6 years ago
William Pitcock
b3bf523c09
rich media: use optimized Object.normalize()
6 years ago
William Pitcock
e75e43b949
common api: use the optimized Object.normalize whenever possible
6 years ago
William Pitcock
9aea7cc224
activitypub: preload child objects when fetching timelines
6 years ago
rinpatch
1b33986bfa
Fix text being nullable in TwitterAPI
6 years ago
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
William Pitcock
fea3696799
common api: move context functions from twitterapi
6 years ago
rinpatch
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
6 years ago
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
William Pitcock
e0edc706cf
oauth: add me property to token responses
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
Karen Konou
d8244c2a1b
remove unused function
6 years ago
Karen Konou
dfeb3aec44
fix credo warning
6 years ago
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
6 years ago
Karen Konou
be465c762b
formatting
6 years ago
Karen Konou
15b21d1983
refactor filtering mechanism
6 years ago
Karen Konou
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
6 years ago
Karen Konou
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
6 years ago
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
William Pitcock
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
6 years ago
William Pitcock
5c7b774f09
reports: unify sending e-mail for both remote and local reports
6 years ago
William Pitcock
64b0120d67
activitypub: add support for forwarding reports
6 years ago
William Pitcock
3b48d5f0c2
common api: add support for forwarding reports
6 years ago
William Pitcock
379442ad17
activitypub: utils: also match Activity objects
6 years ago
William Pitcock
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
6 years ago
William Pitcock
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
6 years ago
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
6 years ago
rinpatch
e630e5e135
Fix delete activities not federating
6 years ago
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
kaniini
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
6 years ago
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
6 years ago
Maxim Filippov
257d8e78e5
Add tags
6 years ago
kaniini
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
6 years ago
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
6 years ago
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed
6 years ago
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case
6 years ago
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency
6 years ago
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
6 years ago
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
6 years ago
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
link0ff
9338f061a3
Support LDAP method start_tls
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
kaniini
4aa285e6ce
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
...
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
6 years ago
lain
07277879e5
Linting.
6 years ago
lain
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
6 years ago
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
lambda
d9ae2d00a1
Merge branch 'feat/style-oauth-login-page' into 'develop'
...
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
6 years ago
Shpuld Shpuldson
50edead11c
Remove chromium input hilight that clashes with our own
6 years ago
Shpuld Shpuldson
8ddbedcd9a
Style again the login page to fit pleroma more
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
William Pitcock
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
kaniini
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
eugenijm
2827dfea50
Allow an admin to delete a user status
6 years ago
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
William Pitcock
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
6 years ago
rinpatch
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
Karen Konou
c2faae70df
Adjust delete activity audience to match the deleted object
6 years ago
Karen Konou
6a69ece437
Revert existing object check
6 years ago
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago