lain
|
037fefe218
|
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
|
2019-03-25 13:37:32 +01:00 |
William Pitcock
|
26b0c802c3
|
fix up missing announcements with preloads
|
2019-03-25 07:38:09 +00:00 |
rinpatch
|
a32bcab04b
|
Merge branch 'fix/eldap-warnings' into 'develop'
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
|
2019-03-24 11:17:40 +00:00 |
William Pitcock
|
4a3dd86a55
|
tests: fix up activity collision test
|
2019-03-23 03:17:51 +00:00 |
William Pitcock
|
73efe95368
|
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
|
2019-03-23 01:09:12 +00:00 |
lambda
|
fee360e581
|
Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
|
2019-03-22 11:03:56 +00:00 |
lain
|
e2afce34b6
|
NodeInfo: Return safe_dm_mentions feature flag.
|
2019-03-22 11:57:20 +01:00 |
kaniini
|
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 |
William Pitcock
|
a223e65f35
|
tests: fixup
|
2019-03-21 23:56:57 +00:00 |
William Pitcock
|
3cc2554fa3
|
mastodon api: add conversation_id extension (ref #674)
|
2019-03-21 23:25:41 +00:00 |
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
2019-03-21 23:24:04 +00:00 |
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
2019-03-21 16:20:58 +01:00 |
link0ff
|
f858df819b
|
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
|
2019-03-21 12:31:16 +02:00 |
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
2019-03-20 21:09:36 +01: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 |
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 |
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 |
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
|
76a13bc5a2
|
Fix test
|
2019-03-17 13:29:28 +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 |
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 |
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
2019-03-15 23:56:14 +03: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 |
link0ff
|
a070dd4a83
|
Add tests for LDAP authorization
|
2019-03-15 16:28:46 +02: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
|
13c298d354
|
Fix tests to assume reblogs shown by default
|
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 |
eugenijm
|
100413bf2c
|
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
|
2019-03-15 01:35:48 +03:00 |
William Pitcock
|
414d4b8088
|
test: add a test for accepting inbound Flag activities
|
2019-03-14 19:04:33 +00:00 |
Maxim Filippov
|
257d8e78e5
|
Add tags
|
2019-03-14 01:52:24 +03:00 |
Maxim Filippov
|
4872914d32
|
Add test when local is false
|
2019-03-13 17:56:15 +03:00 |
Maxim Filippov
|
d5edff6ce6
|
Fix test
|
2019-03-13 16:14:31 +03:00 |
Maxim Filippov
|
490d9cf7b1
|
Add "local" to users admin API
|
2019-03-13 16:04:44 +03: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
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
2019-03-13 04:26:54 +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 |
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 |
lain
|
4811eefa6e
|
MastoAPI StatusView: Add locality indicator.
|
2019-03-11 13:48:27 +01:00 |