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
|
b775fded10
|
Add tests for fetch_ordered_collection
|
2019-03-08 16:28:40 +03:00 |
|
Ekaterina Vaartis
|
5021b7836f
|
Fetch user's outbox posts on first federation with that user
|
2019-03-08 16:27:56 +03:00 |
|
kaniini
|
3c04460c9c
|
Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'
Update Mastodon Frontend to 2019-03-07 bundle
See merge request pleroma/pleroma!911
|
2019-03-08 00:42:17 +00:00 |
|
Haelwenn (lanodan) Monnier
|
05cad042ba
|
Update Mastodon Frontend to 2019-03-07 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07
[ci skip]
|
2019-03-08 00:28:40 +01:00 |
|
rinpatch
|
2a9191a53e
|
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'
MRF: anti followbot: gracefully handle nil display names
See merge request pleroma/pleroma!909
|
2019-03-07 16:42:05 +00:00 |
|
kaniini
|
8e9f6d8f69
|
Merge branch 'update/pleroma-fe-20190307' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!910
|
2019-03-07 13:36:50 +00:00 |
|
William Pitcock
|
3a097bd770
|
update pleroma frontend
|
2019-03-07 13:31:03 +00:00 |
|
William Pitcock
|
3c5926fe91
|
tests: add regression test
|
2019-03-07 12:20:04 +00: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 |
|
|
|
c2faae70df
|
Adjust delete activity audience to match the deleted object
|
2019-03-07 12:26:03 +01:00 |
|
|
|
6a69ece437
|
Revert existing object check
|
2019-03-07 11:53:15 +01:00 |
|
lambda
|
ed5a1bbdfc
|
Merge branch 'preserve-link-headers' into 'develop'
Preserves parameters in link headers
Closes #716
See merge request pleroma/pleroma!908
|
2019-03-07 09:33:54 +00: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 |
|
kaniini
|
d249ea8e7c
|
Merge branch 'feature/647' into 'develop'
[#647] tests for web push
See merge request pleroma/pleroma!904
|
2019-03-06 13:20:12 +00:00 |
|
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
|
kaniini
|
4cbaab2181
|
Merge branch 'features/masto_fe-config' into 'develop'
Add default config for masto_fe
See merge request pleroma/pleroma!906
|
2019-03-06 13:19:26 +00:00 |
|
Maxim Filippov
|
76160122f6
|
Keep heading short
|
2019-03-06 05:01:38 +03: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 |
|
Haelwenn (lanodan) Monnier
|
a283a1fcd0
|
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
|
2019-03-06 02:26:14 +01:00 |
|
|
|
28d5b40d0a
|
Add handling of objects not in database
|
2019-03-05 23:15:22 +01:00 |
|
rinpatch
|
40ff8f5964
|
Add tests for reserved char escaping in upload
|
2019-03-05 19:28:58 +03: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 |
|
Haelwenn
|
682cc94db1
|
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
|
2019-03-05 00:33:04 +00: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 |
|
Maxim Filippov
|
02359d686c
|
local -> only_local
|
2019-03-04 21:36:47 +03:00 |
|
Maxim Filippov
|
e34710b988
|
Format & update docs
|
2019-03-04 21:33:53 +03: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
|
d7a278a733
|
tests: add tests for rich media helper functions
|
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 |
|
