Maxim Filippov
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
kaniini
9b80203ea5
Merge branch 'bugfix/activitypub-public' into 'develop'
...
activitypub addressing improvements
Closes #730 and #739
See merge request pleroma/pleroma!953
2019-03-19 21:36:20 +00:00
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
William Pitcock
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
William Pitcock
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
William Pitcock
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
kaniini
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
kaniini
a5675c965a
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'
...
Document additional pleroma changes to /api/v1/accounts/:id
See merge request pleroma/pleroma!952
2019-03-18 20:32:24 +00:00
Mark Felder
325c106cb5
Document additional pleroma changes to /api/v1/accounts/:id
2019-03-18 19:48:56 +00:00
kaniini
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
rinpatch
d0eb25a3da
Merge branch 'fix-initial-posts' into 'develop'
...
Check if the user has indeed not been federated with before fetching initial posts
See merge request pleroma/pleroma!951
2019-03-18 17:57:19 +00:00
Ekaterina Vaartis
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
rinpatch
9073039d72
Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'
...
Added documentation for Pleroma-specific is_seen in Mastodon API
See merge request pleroma/pleroma!948
2019-03-18 09:58:51 +00:00
eugenijm
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
eugenijm
9971bf5be1
Added documentation for Pleroma-specific is_seen in Mastodon API
2019-03-18 10:40:10 +03:00
kaniini
1344e34ed3
Merge branch 'feature/allow-link-rel-attribute' into 'develop'
...
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
See merge request pleroma/pleroma!946
2019-03-18 00:38:09 +00:00
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
Maxim Filippov
22ca1d1dfe
Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api
2019-03-17 13:30:05 +03:00
Maxim Filippov
76a13bc5a2
Fix test
2019-03-17 13:29:28 +03:00
Maxim Filippov
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
Maxim Filippov
cb2bdd5c07
Order users by nickname
2019-03-17 13:23:08 +03:00
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
lambda
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
kaniini
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
kaniini
f58d47d6f7
Merge branch 'bugfix/ldap-test-fix' into 'develop'
...
test: fix defective ldap setup/teardown
See merge request pleroma/pleroma!943
2019-03-16 04:13:53 +00:00
William Pitcock
40134598a8
test: fix defective ldap setup/teardown
2019-03-16 04:05:19 +00:00
William Pitcock
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
kaniini
532e8b0a43
Merge branch 'mark-notifications-as-read' into 'develop'
...
Allow to mark a single notification as read
See merge request pleroma/pleroma!941
2019-03-16 00:30:04 +00:00
eugenijm
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
kaniini
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
kaniini
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
kaniini
acf215d983
Merge branch 'enable-dedupe-by-default' into 'develop'
...
Enable dedupe by default
See merge request pleroma/pleroma!939
2019-03-15 19:53:25 +00:00
kaniini
b010f9733d
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
...
Fix headers and add !929 docs to extras
See merge request pleroma/pleroma!940
2019-03-15 19:51:06 +00:00
link0ff
a070dd4a83
Add tests for LDAP authorization
2019-03-15 16:28:46 +02: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
ebfc10c834
Fix streamer test
2019-03-15 14:20:08 +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
13c298d354
Fix tests to assume reblogs shown by default
2019-03-15 14:18:21 +01:00
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
2019-03-15 10:58:15 +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
