kaniini
|
4aa285e6ce
|
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
|
2019-03-11 21:43:46 +00:00 |
|
kaniini
|
f9a9639015
|
Merge branch 'add-activity-id-to-push-messages' into 'develop'
WebPush: Add activity id to the push messages.
See merge request pleroma/pleroma!925
|
2019-03-11 21:43:06 +00:00 |
|
rinpatch
|
9ce97d454c
|
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
Switch the CI to Elixir 1.8.1
See merge request pleroma/pleroma!926
|
2019-03-11 19:40:45 +00:00 |
|
rinpatch
|
7b227d935d
|
Switch the CI to Elixir 1.8.1
|
2019-03-11 22:36:02 +03:00 |
|
lain
|
07277879e5
|
Linting.
|
2019-03-11 19:32:21 +01:00 |
|
lain
|
600f428db4
|
WebPush: Add activity id to the push messages.
Makes it easier to relate the push to a given status.
|
2019-03-11 19:23:21 +01:00 |
|
lain
|
3474066f6d
|
MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
|
2019-03-11 15:18:32 +01:00 |
|
lambda
|
2c8deecdd2
|
Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
|
2019-03-11 13:26:12 +00:00 |
|
lambda
|
66774b5567
|
Update Differences-in-MastodonAPI-Responses.md
|
2019-03-11 13:21:03 +00:00 |
|
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
|
2019-03-11 13:19:24 +00:00 |
|
lambda
|
9df4fa22dd
|
Merge branch 'broadcast-activity-id-on-deletion' into 'develop'
Broadcast proper deleted activity id to conform to MastoAPI streaming spec
See merge request pleroma/pleroma!917
|
2019-03-11 13:19:09 +00:00 |
|
lambda
|
0afab16442
|
Merge branch 'fix/roma-links-clients-md' into 'develop'
Update homepages and provide source code links for Roma apps in Clients.md
See merge request pleroma/pleroma!919
|
2019-03-11 13:15:45 +00:00 |
|
Shpuld Shpuldson
|
50edead11c
|
Remove chromium input hilight that clashes with our own
|
2019-03-11 15:10:42 +02:00 |
|
Shpuld Shpuldson
|
8ddbedcd9a
|
Style again the login page to fit pleroma more
|
2019-03-11 14:57:04 +02:00 |
|
lain
|
4811eefa6e
|
MastoAPI StatusView: Add locality indicator.
|
2019-03-11 13:48:27 +01:00 |
|
eugenijm
|
6038c8a753
|
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
|
2019-03-11 09:02:03 +03:00 |
|
rinpatch
|
6caa500cf1
|
Change order of source code to align with platforms
|
2019-03-11 08:36:56 +03:00 |
|
rinpatch
|
85632a38f9
|
Update homepages and provide source code links for Roma apps in Clients.md
|
2019-03-11 08:33:57 +03:00 |
|
rinpatch
|
8e6b850610
|
Merge branch 'patch-2' into 'develop'
[Doc] Rename Mastalab -> Fedilab in Clients.md
See merge request pleroma/pleroma!918
|
2019-03-11 05:27:14 +00:00 |
|
Hakaba Hitoyo
|
4826c06172
|
Rename Mastalab -> Fedilab in Clients.md
|
2019-03-11 01:40:34 +00:00 |
|
kaniini
|
5075e8abe5
|
Merge branch 'bugfix/tesla-safety' into 'develop'
tesla hardening
Closes #712 and #672
See merge request pleroma/pleroma!912
|
2019-03-08 23:02:55 +00:00 |
|
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 |
|
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 |
|
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 |
|