Commit Graph

1722 Commits

Author SHA1 Message Date
lain c1ebb38d3a Conversation: Also create participations for remote users.
Needed to get the participating user list.
2019-04-15 21:45:25 +02:00
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
eugenijm 27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00
rinpatch fd2e31af86 oops 2019-04-15 11:59:01 +03:00
rinpatch 5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves 2019-04-15 10:21:18 +03:00
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view 2019-04-14 11:35:15 +03:00
Alex S c5d0fffeaf naming fix 2019-04-13 14:55:42 +07:00
Alex S c349573791 Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
Egor Kislitsyn d0304b4f92 more tests 2019-04-12 16:51:28 +07:00
Egor Kislitsyn dd097a406b add tests 2019-04-12 16:38:32 +07:00
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +00:00
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
Alexander Strizhakov e03d24af96 in_reply_to_id - null 2019-04-12 02:21:32 +00:00
lain 6f880b1627 Conversation: Fix tests. 2019-04-11 13:31:20 +02:00
lain 36ec8d9694 ActivityPub: Fix specs. 2019-04-11 13:20:46 +02:00
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10 21:40:38 +03:00
lain c352a0aba6 Conversations: Make tests run. 2019-04-10 17:48:31 +02:00
lain cf353514fe Participations: Add last activity. 2019-04-10 17:28:02 +02:00
lain 20d9b90760 Participation: Get for a user. 2019-04-10 17:05:33 +02:00
lain 280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain 64c1c3a407 Participations: Add marking as read and unread. 2019-04-10 15:12:01 +02:00
lain d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lain b5cecebbc1 Conversations: Fix specs. 2019-04-10 09:32:17 +02:00
lambda c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls

Closes #738

See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
rinpatch b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense 2019-04-09 23:20:31 +03:00
rinpatch 144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop'
Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
lambda 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
Sachin Joshi 07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Alex S fee50636d0 removing not needed invite update 2019-04-08 20:08:16 +07:00
lain a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations 2019-04-08 14:10:51 +02:00
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
Sadposter 13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
Alexander Strizhakov 36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
Alex S f0ca0696c8 test for valid_invite? 2019-04-08 17:06:04 +07:00
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Ivan Tashkinov 44829d9181 AdminApiControllerTest unused variables fix. 2019-04-08 12:32:55 +03:00
Egor Kislitsyn a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
#   config/config.exs
#   docs/config.md
2019-04-08 09:18:01 +00:00
lambda b177e1e7f3 Merge branch 'scheduled-activities' into 'develop'
Scheduled activities

See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
Alex S 012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
Sadposter 76fdfd1c7f Add check on activity visibility in sub notification 2019-04-07 15:11:29 +01:00
Alex S b810aac117 added docs to docs/api/admin_api.md
code style and little renamings
2019-04-07 19:48:52 +07:00
feld fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop'
Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm b3870df51f Handle `scheduled_at` on status creation. 2019-04-06 23:55:58 +03:00
eugenijm 7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
eugenijm 7aa53d52bd Return 403 on oauth token exchange for a deactivated user 2019-04-06 23:27:55 +03:00
feld 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop'
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request pleroma/pleroma!1030
2019-04-06 16:03:35 +00:00
Alex S ce8d457132 little channges 2019-04-06 22:38:35 +07:00
Alex S 76d8928cf1 fix for field name 2019-04-06 20:49:43 +07:00
Alex S 7410aee886 Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
Alex S dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Alex S 47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S be54e40890 twitter api registration
fix for twitter api tests
2019-04-06 17:18:59 +07:00
Alex S 0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Sergey Suprunenko e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS 2019-04-05 22:48:11 +02:00
Mark Felder fac76bfa35 We actually want the user id not nickname in the test... 2019-04-05 12:11:19 -05:00
Mark Felder c746087f57 Also remove Repo functions in the tests 2019-04-05 11:59:56 -05:00
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
Sadposter a270e7a191
Mix format everything 2019-04-05 17:07:58 +01:00
Sadposter f6e131eeb9 Don't use twitterAPI for subscription tests 2019-04-05 17:02:09 +01:00
Sadposter 9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
Sadposter 73afd13c21 Add subscription key to one test I forgot about 2019-04-05 15:37:36 +01:00
Sadposter 06cd547fc6 Format subscriptions related stuff 2019-04-05 15:30:34 +01:00
Sadposter d56866c824 Add subscribed status to user view
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
Sadposter 75c4ceb4a2 Add tests for subscriptions 2019-04-05 15:30:29 +01:00
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push 2019-04-05 19:38:44 +07:00
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. 2019-04-05 15:12:02 +03:00
Ivan Tashkinov 3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests). 2019-04-05 09:19:17 +03:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Ivan Tashkinov f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements. 2019-04-04 22:41:03 +03:00
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Haelwenn 0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.

See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
lambda 256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format

Closes #763

See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
lambda a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit

See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
lain 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships 2019-04-02 16:10:38 +02:00
lain fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. 2019-04-02 16:08:55 +02:00
Alex S fa8483cb80 Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
lambda 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status

See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
lambda ce9284b36f Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
lambda b95cf3d490 Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions

See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
Alex S 9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
rinpatch fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db 2019-04-02 14:31:18 +03:00
Egor Kislitsyn 20c619f85f replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests 2019-04-02 17:58:32 +07:00
lambda 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
lambda 26d509cc86 Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible

See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
cascode 95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Egor Kislitsyn 9a59c26619 replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)` 2019-04-02 17:47:52 +07:00
Ivan Tashkinov 15ce710460 Added "GET /oauth/authorize" tests. 2019-04-02 13:43:33 +03:00
Egor Kislitsyn 11c2d6bdc4 change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests 2019-04-02 17:08:03 +07:00
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.get_by_id(id)` 2019-04-02 17:01:26 +07:00
Sergey Suprunenko 3db9235150
Ignore dates in wrong formats 2019-04-02 11:32:36 +02:00
Egor Kislitsyn a14742f495 add `user delete_activities` mix task 2019-04-02 16:30:11 +07:00
Alex S 484162c187 test fix 2019-04-02 16:26:40 +07:00
Alex S 9b2188da7c refactoring of emoji tags config to use groups 2019-04-02 15:44:56 +07:00
Ivan Tashkinov aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations 2019-04-02 09:19:10 +03:00
Sachin Joshi 6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Sergey Suprunenko b6f9f7b8aa
Handle dates in the Unix timestamp format (Fixes #763) 2019-04-01 22:45:24 +02:00
Sachin Joshi 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Alex S 17d3d05a71 code style
little fix
2019-04-01 17:54:30 +07:00
Alex S 3601f03147 Adding tag to emoji ets table
changes in apis
2019-04-01 17:17:57 +07:00
lain e3bf6655ba Add replying. 2019-03-31 21:24:29 +02:00
lain 10fdc080a0 BBS: Tests and formatting. 2019-03-31 20:35:10 +02:00
rinpatch 1bb4d5d65b Implement fake status submit 2019-03-29 21:59:04 +03:00
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue` 2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier 6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id 2019-03-28 17:23:21 +01:00
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm 55d086b520 Notification controls
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
rinpatch 776bb5137f Fix muting reblogs tests 2019-03-27 13:43:43 +03:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
eugenijm a4ab60ac54 Add vapid_key to the `POST /api/v1/apps` response 2019-03-26 23:27:37 +03:00
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
lambda ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lambda c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)

See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
lain 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
Ivan Tashkinov 47b49ab1a1 Test for MastoAPI /api/v1/instance response structure (formatting fix). 2019-03-26 18:18:36 +03:00
lambda 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
Ivan Tashkinov caf0e9cf33 Test for MastoAPI /api/v1/instance response structure. 2019-03-26 18:13:24 +03:00
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
rinpatch aacdcac1be Credo is upset about me not remembering the alphabet 2019-03-26 17:35:45 +03:00
rinpatch 087662d4fb Fix formatting 2019-03-26 17:18:18 +03:00
rinpatch 406d19331f Remove ActivityRepresenter 2019-03-26 17:16:21 +03:00
eugenijm 568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`. 2019-03-26 15:09:06 +03: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 aaec91b9a1 relay test: don't do preloading (since follow objects are activities, it's a mess) 2019-03-23 01:23:02 +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
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
link0ff f858df819b Skip tests in LDAPAuthorizationTest if :eldap module is unavailable 2019-03-21 12:31:16 +02: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
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
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
eugenijm 984b5f8adf MastoAPI followers/following endpoints 2019-03-12 16:01:24 +03:00
rinpatch faf238c1b0 Fix upload tests 2019-03-12 15:33:15 +03:00