alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,309 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

1413 Commits

Author SHA1 Message Date
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
rinpatch 3229c7a1d6 Ensure fts is prefered over trigram and use union_all instead of union in user search query 2019-03-22 08:39:49 +03: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
kaniini b68fb3dc17 Merge branch 'imageoptim' into 'develop' 
used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944
 2019-03-21 00:59:24 +00:00
lain 8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Maxim Filippov ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03: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
optikfluffel 00c5d7248f fix UploadTest to use new image_tmp.jpg 2019-03-19 10:10:48 +01:00
optikfluffel a907522690 used imageOptim to reduce size of image files 2019-03-19 10:10:48 +01: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
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
Maxim Filippov 93291c3d7a Order users by nickname 2019-03-17 13:23:31 +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
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
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 355f285a86 Fix uploaded media plug test 2019-03-14 22:26:54 +03:00
William Pitcock 414d4b8088 test: add a test for accepting inbound Flag activities 2019-03-14 19:04:33 +00:00
rinpatch e2fe796c63 Add some tests 2019-03-14 22:02:48 +03: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 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 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