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 |
|
rinpatch
|
92a69bddce
|
escape quotation marks in Content-Disposition header
|
6 years ago |
|
rinpatch
|
5a73cae2be
|
WIP: Stop mangling filenames
|
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 |
|
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
|
1f78d23eed
|
http: connection: unify adapter configuration and defaults
|
6 years ago |
|
William Pitcock
|
ba48bd901c
|
http: connection: relax the timeouts a little
|
6 years ago |
|
William Pitcock
|
19afd9f81f
|
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
|
6 years ago |
|
William Pitcock
|
773f532b14
|
http: actually pass the options list to the Connection factory
|
6 years ago |
|
William Pitcock
|
50ba4ba2c9
|
http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
|
6 years ago |
|
William Pitcock
|
2a83c0ba93
|
http: safely catch erlang exits and elixir errors from hackney (ref #672)
|
6 years ago |
|
kaniini
|
46200d8fac
|
Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
|
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
|
39b766cc43
|
Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
|
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 |
|
Haelwenn
|
96901b6554
|
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
|
6 years ago |
|
Karen Konou
|
28d5b40d0a
|
Add handling of objects not in database
|
6 years ago |
|
rinpatch
|
4263edc9c9
|
Properly escape reserved URI charachters in upload urls
|
6 years ago |
|
rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
788a354ce0
|
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
fc37e5815f
|
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
|
6 years ago |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
6 years ago |
|
Maxim Filippov
|
2d30fc279f
|
Typo
|
6 years ago |
|
William Pitcock
|
b7aa1ea9e6
|
rich media: helpers: rework validate_page_url()
|
6 years ago |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
6 years ago |
|
William Pitcock
|
d38d537bee
|
rich media: don't crawl bogus URIs
|
6 years ago |
|
kaniini
|
d45dbdce5a
|
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
|
6 years ago |
|
Maxim Filippov
|
f620199836
|
Merge search endpoint into /users
|
6 years ago |
|
Maxim Filippov
|
0245ce842f
|
Remove unused code
|
6 years ago |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
6 years ago |
|
kaniini
|
ca5d894e68
|
Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
|
6 years ago |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
6 years ago |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
6 years ago |
|
KokaKiwi
|
bf43f055dd
|
Set content types settings on mastofe endpoint.
|
6 years ago |
|
KokaKiwi
|
b57913b13a
|
Fix supported TLS versions as TLS 1.3 support seems buggy.
|
6 years ago |
|
Karen Konou
|
1445dc25d4
|
fix format
|
6 years ago |
|
Karen Konou
|
aab86698a5
|
Expand "to" of delete activities
|
6 years ago |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
6 years ago |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
6 years ago |
|
kaniini
|
dd5865535e
|
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
|
6 years ago |
|
William Pearson
|
818a7894da
|
Don't stream muted accounts
|
6 years ago |
|
link0ff
|
88a672fe88
|
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
|
6 years ago |
|
link0ff
|
19e2b85247
|
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
|
6 years ago |
|
kaniini
|
ace4231628
|
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
|
6 years ago |
|
kaniini
|
6c6a2dbfdd
|
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
|
6 years ago |
|
kaniini
|
b531e366df
|
Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
|
6 years ago |
|
kaniini
|
413cf00cc3
|
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
|
6 years ago |
|
kaniini
|
c93479c6f5
|
Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
|
6 years ago |
|
eugenijm
|
d5418e9ff7
|
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
|
6 years ago |
|
eugenijm
|
af0039a3a0
|
Use atomic update for note count and follower count
|
6 years ago |
|
lambda
|
9b63fda9c7
|
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
|
6 years ago |
|
eugenijm
|
c46950d3b1
|
Increment user note count only on public activities
|
6 years ago |
|
eugenijm
|
1a1f4520cd
|
Use sql query in User.get_follow_requests/1 for filtering logic
|
6 years ago |
|
Maxim Filippov
|
2ec8cf5665
|
Add pagination to search
|
6 years ago |
|
rinpatch
|
f38c316e6e
|
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f2452d5700
|
Pleroma.User: mix format
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
8e6f7fdb86
|
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
39a5bea9b7
|
Pleroma.User: Fix syntax and user.ap_id call
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
3d22642352
|
Pleroma.User: Pass an array to profile_urls
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
9b83236fb0
|
Pleroma.Web.RelMe: fixups
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
56d4e39012
|
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
b6a001a34c
|
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
|
6 years ago |
|
Maxim Filippov
|
f635b675b2
|
Refactor a little bit
|
6 years ago |
|
Maxim Filippov
|
f1a4c3163b
|
Show current user in users list as well
|
6 years ago |
|
Maxim Filippov
|
5b08b470f6
|
Add "local" params to users search
|
6 years ago |
