be465c762b
formatting
2019-03-15 14:18:53 +01:00
15b21d1983
refactor filtering mechanism
2019-03-15 14:18:53 +01:00
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
2019-03-15 14:18:53 +01:00
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
2019-03-15 14:18:53 +01:00
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
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.
2019-03-15 02:28:18 +00:00
eugenijm
100413bf2c
Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
rinpatch
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
2019-03-14 17:49:00 +00:00
rinpatch
e630e5e135
Fix delete activities not federating
2019-03-14 20:43:14 +03:00
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
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
2019-03-14 02:00:47 +00:00
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
2019-03-14 03:17:09 +03:00
Maxim Filippov
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
kaniini
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
2019-03-13 22:04:23 +00:00
eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
2019-03-13 12:17:57 +01:00
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency
2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
rinpatch
92a69bddce
escape quotation marks in Content-Disposition header
2019-03-12 09:21:13 +03:00
rinpatch
5a73cae2be
WIP: Stop mangling filenames
2019-03-12 09:10:19 +03:00
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
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
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
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
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
