William Pitcock
|
1f78d23eed
|
http: connection: unify adapter configuration and defaults
|
2019-03-08 22:59:10 +00:00 |
|
William Pitcock
|
ba48bd901c
|
http: connection: relax the timeouts a little
|
2019-03-08 22:56:16 +00:00 |
|
William Pitcock
|
19afd9f81f
|
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
|
2019-03-08 22:56:16 +00:00 |
|
William Pitcock
|
773f532b14
|
http: actually pass the options list to the Connection factory
|
2019-03-08 22:56:16 +00:00 |
|
William Pitcock
|
50ba4ba2c9
|
http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
|
2019-03-08 22:56:16 +00:00 |
|
William Pitcock
|
2a83c0ba93
|
http: safely catch erlang exits and elixir errors from hackney (ref #672)
|
2019-03-08 22:56:16 +00:00 |
|
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
|
2019-03-08 22:53:12 +00:00 |
|
kaniini
|
735f40047a
|
Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
|
2019-03-08 22:47:41 +00:00 |
|
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
|
2019-03-08 22:33:31 +00:00 |
|
eugenijm
|
2827dfea50
|
Allow an admin to delete a user status
|
2019-03-08 20:21:56 +03:00 |
|
Ekaterina Vaartis
|
5021b7836f
|
Fetch user's outbox posts on first federation with that user
|
2019-03-08 16:27:56 +03:00 |
|
William Pitcock
|
e53a9fd15e
|
MRF: anti followbot: gracefully handle accounts without a display name
|
2019-03-07 12:13:48 +00:00 |
|
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
|
2019-03-07 11:31:08 +00:00 |
|
Karen Konou
|
c2faae70df
|
Adjust delete activity audience to match the deleted object
|
2019-03-07 12:26:03 +01:00 |
|
Karen Konou
|
6a69ece437
|
Revert existing object check
|
2019-03-07 11:53:15 +01:00 |
|
eugenijm
|
7342b5a45f
|
Preserve parameters in link headers (Mastodon API)
|
2019-03-07 09:12:16 +03:00 |
|
kaniini
|
0fe715f3ba
|
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
|
2019-03-06 22:27:42 +00:00 |
|
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
|
2019-03-06 13:22:02 +00:00 |
|
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
|
2019-03-06 13:20:51 +00:00 |
|
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
|
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
|
2019-03-06 01:45:17 +00:00 |
|
Karen Konou
|
28d5b40d0a
|
Add handling of objects not in database
|
2019-03-05 23:15:22 +01:00 |
|
rinpatch
|
4263edc9c9
|
Properly escape reserved URI charachters in upload urls
|
2019-03-05 18:09:23 +03:00 |
|
rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
2019-03-05 07:05:44 +00:00 |
|
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.
|
2019-03-05 02:13:22 +01:00 |
|
Haelwenn (lanodan) Monnier
|
fc37e5815f
|
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
|
2019-03-05 01:44:24 +01:00 |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
2019-03-05 03:17:24 +03:00 |
|
Maxim Filippov
|
2d30fc279f
|
Typo
|
2019-03-05 02:11:15 +03:00 |
|
William Pitcock
|
b7aa1ea9e6
|
rich media: helpers: rework validate_page_url()
|
2019-03-04 18:39:13 +00:00 |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
2019-03-04 18:31:49 +00:00 |
|
William Pitcock
|
d38d537bee
|
rich media: don't crawl bogus URIs
|
2019-03-04 18:31:49 +00:00 |
|
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
|
2019-03-04 18:29:13 +00:00 |
|
Maxim Filippov
|
f620199836
|
Merge search endpoint into /users
|
2019-03-04 21:26:32 +03:00 |
|
Maxim Filippov
|
0245ce842f
|
Remove unused code
|
2019-03-04 20:49:20 +03:00 |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
2019-03-04 20:47:34 +03:00 |
|
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
|
2019-03-04 15:59:57 +00:00 |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
2019-03-04 18:09:58 +03:00 |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
2019-03-04 13:25:32 +00:00 |
|
KokaKiwi
|
b57913b13a
|
Fix supported TLS versions as TLS 1.3 support seems buggy.
|
2019-03-04 11:30:26 +01:00 |
|
Karen Konou
|
1445dc25d4
|
fix format
|
2019-03-04 11:18:45 +01:00 |
|
Karen Konou
|
aab86698a5
|
Expand "to" of delete activities
|
2019-03-04 11:18:45 +01:00 |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03:00 |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
2019-03-04 01:00:37 +03:00 |
|
kaniini
|
dd5865535e
|
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
|
2019-03-03 21:10:10 +00:00 |
|
William Pearson
|
818a7894da
|
Don't stream muted accounts
|
2019-03-03 20:54:53 +00:00 |
|
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
|
2019-03-03 16:00:49 +00:00 |
|
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
|
2019-03-03 15:59:15 +00:00 |
|
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
|
2019-03-03 15:51:32 +00:00 |
|
kaniini
|
413cf00cc3
|
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
|
2019-03-03 15:50:41 +00:00 |
|
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
|
2019-03-03 15:49:19 +00:00 |
|