1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
19a19bdd81
Fix migration timestamp type
2019-03-20 16:04:59 +03:00
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
4b3c86c1a6
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
...
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
dfeb3aec44
fix credo warning
2019-03-15 14:36:07 +01:00
094e1ef048
formatting
2019-03-15 14:28:14 +01:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
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
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
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
d02f1120f9
Content-Disposition regex improvements
2019-03-15 08:29:51 +03:00
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
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
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
958227d556
MediaProxy: parse filename from content-disposition for non-whitelisted types
2019-03-15 01:36:29 +03:00
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
2019-03-14 19:52:08 +00:00
5c7b774f09
reports: unify sending e-mail for both remote and local reports
2019-03-14 19:44:08 +00:00
64b0120d67
activitypub: add support for forwarding reports
2019-03-14 19:36:17 +00:00
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
3b48d5f0c2
common api: add support for forwarding reports
2019-03-14 19:29:33 +00:00
379442ad17
activitypub: utils: also match Activity objects
2019-03-14 19:29:04 +00:00
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
2019-03-14 19:06:02 +00:00
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
2019-03-14 19:05:42 +00:00
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
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
e630e5e135
Fix delete activities not federating
2019-03-14 20:43:14 +03:00
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-14 17:43:30 +02:00
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
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
f3964f4024
Ensure empty array is returned for tags
2019-03-14 03:17:09 +03:00
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
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
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
2019-03-13 12:17:57 +01:00
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
2019-03-13 04:26:56 +01:00
4b73ca638e
[Credo][CI] Add readability as it’s fixed
2019-03-13 04:26:56 +01:00
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
8cd3eada7d
[Credo] write large numbers with underscore separation
2019-03-13 04:26:56 +01:00
c3d41b2b6e
[Credo] make all variables use snake_case
2019-03-13 04:26:56 +01:00
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
4c440f12c3
[Credo] Fix the consistency
2019-03-13 04:17:30 +01:00
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
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
9338f061a3
Support LDAP method start_tls
2019-03-12 18:20:02 +02:00
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
92a69bddce
escape quotation marks in Content-Disposition header
2019-03-12 09:21:13 +03:00
5a73cae2be
WIP: Stop mangling filenames
2019-03-12 09:10:19 +03:00
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
07277879e5
Linting.
2019-03-11 19:32:21 +01:00
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
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
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
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
50edead11c
Remove chromium input hilight that clashes with our own
2019-03-11 15:10:42 +02:00
8ddbedcd9a
Style again the login page to fit pleroma more
2019-03-11 14:57:04 +02:00
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
1f78d23eed
http: connection: unify adapter configuration and defaults
2019-03-08 22:59:10 +00:00
ba48bd901c
http: connection: relax the timeouts a little
2019-03-08 22:56:16 +00:00
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
2019-03-08 22:56:16 +00:00
773f532b14
http: actually pass the options list to the Connection factory
2019-03-08 22:56:16 +00:00
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
2a83c0ba93
http: safely catch erlang exits and elixir errors from hackney (ref #672 )
2019-03-08 22:56:16 +00:00
kaniini