Zachary Dunn
|
97b35e00b0
|
Fix with expression always matching
|
2019-03-18 14:59:52 +00:00 |
|
|
Zachary Dunn
|
e572786dad
|
Run
|
2019-03-18 14:53:30 +00:00 |
|
|
Zachary Dunn
|
af4338da0c
|
Use better error message
|
2019-03-18 14:52:24 +00:00 |
|
|
Ivan Tashkinov
|
26b6354095
|
[#923] Support for multiple (external) registrations per user via Registration.
|
2019-03-18 17:23:38 +03:00 |
|
|
Zachary Dunn
|
5ba14c664b
|
Fix missing end brace
|
2019-03-18 14:05:10 +00:00 |
|
|
Zachary Dunn
|
a2e03d4f3c
|
Initial attempt at updating return type
|
2019-03-18 13:56:59 +00: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 |
|
|
Ivan Tashkinov
|
2a96283efb
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
|
2019-03-18 10:26:41 +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 |
|
|
Haelwenn (lanodan) Monnier
|
f6fab01ba7
|
Web.Router: Add routes for Conversation mastoAPI
|
2019-03-17 17:06:28 +01:00 |
|
|
Haelwenn (lanodan) Monnier
|
42d034505a
|
Add test for conversation API beforehand
|
2019-03-17 16:51:26 +01: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 |
|
|
Ivan Tashkinov
|
2739057442
|
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
|
2019-03-15 17:11:00 +03:00 |
|
|
Ivan Tashkinov
|
aacbf0f570
|
[#923] OAuth: prototype of sign in / sign up with Twitter.
|
2019-03-15 17:08:03 +03:00 |
|
|
Karen Konou
|
d8244c2a1b
|
remove unused function
|
2019-03-15 15:03:03 +01:00 |
|
|
Karen Konou
|
dfeb3aec44
|
fix credo warning
|
2019-03-15 14:36:07 +01:00 |
|
|
Karen Konou
|
094e1ef048
|
formatting
|
2019-03-15 14:28:14 +01:00 |
|
|
Karen Konou
|
ebfc10c834
|
Fix streamer test
|
2019-03-15 14:20:08 +01:00 |
|
|
Karen Konou
|
da53c079db
|
Refactor to store user ap_id, add tests
|
2019-03-15 14:20:08 +01:00 |
|
|
Karen Konou
|
be465c762b
|
formatting
|
2019-03-15 14:18:53 +01:00 |
|
|
Karen Konou
|
15b21d1983
|
refactor filtering mechanism
|
2019-03-15 14:18:53 +01:00 |
|
|
Karen Konou
|
aa71139e4a
|
Fix elixir 1.8 vs 1.7 format conflict
|
2019-03-15 14:18:53 +01:00 |
|
|
Karen Konou
|
fe4c1d26fc
|
Add ActivityPub.contain_activity checks to streamer
|
2019-03-15 14:18:53 +01:00 |
|
|
Karen Konou
|
13c298d354
|
Fix tests to assume reblogs shown by default
|
2019-03-15 14:18:21 +01:00 |
|
|
Karen Konou
|
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 |
|
|
rinpatch
|
28cfb2c37a
|
Enable dedupe by default
|
2019-03-15 12:11:13 +03:00 |
|
|
rinpatch
|
d7a34b604b
|
Extend MastoAPI to provide attachment mimetypes
|
2019-03-15 11:58:12 +03:00 |
|
|
rinpatch
|
d02f1120f9
|
Content-Disposition regex improvements
|
2019-03-15 08:29:51 +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 |
|