Commit graph

  • 28b4093233 mastodon websocket: return errors using ok, not stop William Pitcock 2019-02-28 16:23:55 +0000
  • 388a3f4ca2 mastodon websocket: bring back infinity timeout William Pitcock 2019-02-28 16:23:24 +0000
  • 46f29b9da1 Add search users endpoint Maxim Filippov 2019-02-28 19:04:47 +0300
  • f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors William Pitcock 2019-02-28 16:02:48 +0000
  • 9aec00d711 config: update config for cowboy 2 endpoints William Pitcock 2019-02-28 15:43:38 +0000
  • bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x William Pitcock 2019-02-28 15:17:01 +0000
  • e10ca35b3d mix: update dependencies for cowboy 2.0 William Pitcock 2019-02-28 14:53:54 +0000
  • 70e82a3465 Add test for the second page Maxim Filippov 2019-02-28 17:54:02 +0300
  • 72b7a0797e Use Mastodon API views in Admin API Maxim Filippov 2019-02-28 17:43:09 +0300
  • a47cc5a2cf Merge branch 'customizable_auth' into 'develop' href 2019-02-28 11:18:01 +0000
  • 3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. Ivan Tashkinov 2019-02-28 14:12:41 +0300
  • 4e77f68414 Added auth_template/0 to DatabaseAuthenticator. Ivan Tashkinov 2019-02-28 13:58:58 +0300
  • cf426a719d Merge branch 'with-mutes' into 'develop' kaniini 2019-02-28 10:22:19 +0000
  • 90a24fbf95 Merge branch 'customizable_auth' into 'develop' href 2019-02-28 10:12:26 +0000
  • 089e2588a3 Merge branch 'speedup-follow-requests' into 'develop' kaniini 2019-02-28 10:10:03 +0000
  • 3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop' kaniini 2019-02-28 10:08:31 +0000
  • b6f915313f Made auth customization be runtime-configurable. Ivan Tashkinov 2019-02-28 13:00:54 +0300
  • 9cc98b496e Merge branch 'feature/mastoapi-embedded-relationships' into 'develop' lambda 2019-02-28 07:35:26 +0000
  • 6b11011039 Added deactivated to the user view eugenijm 2019-02-28 08:31:33 +0300
  • 2883f75a3a Add pagination to users admin API Maxim Filippov 2019-02-28 01:11:56 +0300
  • bbbdbec4fd Remove parts of the old activity view. lain 2019-02-27 17:24:51 +0100
  • 9ade1242c2 Add user muted status info to twitterapi. lain 2019-02-27 16:52:03 +0100
  • c1ae495878 Add user muted status info to MastodonAPI. lain 2019-02-27 16:46:47 +0100
  • c4235f96bd Add with_muted param. lain 2019-02-27 16:37:42 +0100
  • b24cc44e8d Follower requests: Utilize object index. lain 2019-02-27 15:01:54 +0100
  • 8d8cb08f94 Add follow request test. lain 2019-02-27 14:51:07 +0100
  • 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience William Pitcock 2019-02-27 13:01:10 +0000
  • 14bc6bd40f Merge branch 'fix/formatter' into 'develop' kaniini 2019-02-27 08:45:43 +0000
  • 5d961d536c fix formatter Egor Kislitsyn 2019-02-27 15:40:30 +0700
  • a50a47a011 Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop' kaniini 2019-02-27 07:28:10 +0000
  • ed7fd6b47e Add missing docs and tests Maxim Filippov 2019-02-27 03:08:03 +0300
  • 1c265b3b19 Merge branch 'auto_linker' into 'develop' kaniini 2019-02-26 23:32:26 +0000
  • c3ac9424d2 AutoLinker Egor 2019-02-26 23:32:26 +0000
  • e9703a5326 Merge branch 'feature/more-actions-to-admin-api' into 'develop' kaniini 2019-02-26 23:31:53 +0000
  • 90d0d055fc Add more admin actions Maxim Filippov 2019-02-27 00:13:38 +0300
  • b985c91431 Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop' kaniini 2019-02-26 16:47:18 +0000
  • e1bdaaa3fe need to put back ipv4 listen instruct Kenneth Zhao 2019-02-26 08:41:37 -0800
  • e98d34e5fb Added missing copyright headers. Ivan Tashkinov 2019-02-26 16:26:54 +0300
  • fd46edb473 Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth Ivan Tashkinov 2019-02-26 15:29:43 +0300
  • e82b70eb53 Database authenticator behaviour / Pleroma implementation refactoring. Ivan Tashkinov 2019-02-26 15:27:01 +0300
  • 03afee3fd1 Merge branch 'nginx-cfg' into 'develop' Haelwenn 2019-02-26 06:56:29 +0000
  • d3a6c065a4 Add ipv6 handling to pleroma.nginx PEA 2019-02-25 23:37:46 -0500
  • 2ed7003c26 Merge branch 'trivial/remove-io-inspect-spam' into 'develop' kaniini 2019-02-24 19:03:58 +0000
  • fc9d895ebc twitter card: remove IO.inspect() spam William Pitcock 2019-02-24 18:53:49 +0000
  • efa506b874 delegate user retrieval to the User module 11backslashes 2019-02-24 13:23:47 -0500
  • 7daa9a8c42 Merge branch 'add-apache-cache-config' into 'develop' kaniini 2019-02-23 04:01:21 +0000
  • 101c20f8d9 Merge branch 'card-handling' into 'develop' kaniini 2019-02-23 03:59:23 +0000
  • ab2d2dfa7b Merge branch 'fix/meck' into 'develop' kaniini 2019-02-23 03:56:31 +0000
  • c75e643a72
    apache config: add instructions for mediaproxy. faried nawaz 2019-02-23 00:18:03 +0500
  • bf562a6ecc Upate meck to fix tests on MacOS Mark Felder 2019-02-22 17:26:47 +0000
  • e278d47023 OpenLDAP support link0ff 2019-02-22 15:03:43 +0200
  • 9e0686efa6 Move visibility into own module. lain 2019-02-22 13:29:52 +0100
  • 34646c6923 Merge branch 'oauth2_scopes_migration_hotfix' into 'develop' href 2019-02-22 11:16:10 +0000
  • 62296f5a25 Fix private post card handling. lain 2019-02-22 12:02:51 +0100
  • b227ccab82 Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope. Ivan Tashkinov 2019-02-22 14:00:18 +0300
  • afddce45b3 Minor setting name adjustment (:app_template -> :app_layout). Ivan Tashkinov 2019-02-22 11:10:17 +0300
  • 5a4e2905fe Merge branch 'fix/twittercards' into 'develop' kaniini 2019-02-22 04:38:14 +0000
  • eeeb8124b9 Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop' kaniini 2019-02-22 04:37:48 +0000
  • 7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty KZ 2019-02-22 04:37:48 +0000
  • 1097ce6d9f Auth customization support. OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection. Ivan Tashkinov 2019-02-21 18:55:19 +0300
  • 2813f28b6f Merge branch 'bugfix/httpsig-sign-date' into 'develop' lambda 2019-02-21 08:20:06 +0000
  • 19bd799bd7 Merge branch 'bugfix/as2-accept-json' into 'develop' lambda 2019-02-21 08:14:24 +0000
  • 45b06860d3 Merge branch '2019-02-21-update-frontend' into 'develop' lambda 2019-02-21 08:11:06 +0000
  • 553ce57d42 update frontend lain 2019-02-21 09:04:35 +0100
  • f8a72f2997 activitypub: sign http date header William Pitcock 2019-02-21 00:23:17 +0000
  • 1c87102d01 mix: add timex dependency William Pitcock 2019-02-21 00:19:49 +0000
  • e95dbecf3e tests: fix formatting William Pitcock 2019-02-20 20:49:10 +0000
  • 1803d9a022 fix fetching AP objects with application/json William Pitcock 2019-02-20 20:45:40 +0000
  • aa45674be6 tests: add test for fetching AP objects with application/json. William Pitcock 2019-02-20 20:45:09 +0000
  • 1f85c9c9c7 Merge branch 'feature/improve-error-logging' into 'develop' lambda 2019-02-20 18:21:58 +0000
  • 22e2ed235d logging: only return ISE reasons in API responses when in dev or test mode William Pitcock 2019-02-20 17:36:19 +0000
  • 3ee77e95b2 tests: fix tests William Pitcock 2019-02-20 17:23:05 +0000
  • 8b08096436 logging: improve visibility into ISE errors William Pitcock 2019-02-19 21:31:27 +0000
  • 54f9e3d382 Merge branch 'feature/reports' into 'develop' kaniini 2019-02-20 16:51:25 +0000
  • bff9eb5ef7 Reports Egor 2019-02-20 16:51:25 +0000
  • 77fb926afa Merge branch 'nicer-share-urls' into 'develop' kaniini 2019-02-20 16:42:52 +0000
  • 59c27f29c8 Add some nicer urls in status view. lain 2019-02-20 17:36:16 +0100
  • dff5e1e46a Merge branch '468_oauth2_scopes' into 'develop' lambda 2019-02-20 16:15:45 +0000
  • b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). Ivan Tashkinov 2019-02-20 17:27:41 +0300
  • 6fe7acd58e [#468] Merged upstream/develop. Ivan Tashkinov 2019-02-20 16:48:59 +0300
  • 11b3c10c54 Merge branch 'muting' into 'develop' lambda 2019-02-20 13:19:37 +0000
  • 4196d9af11 Add test for User.mutes and so on. lain 2019-02-20 14:14:52 +0100
  • 9ae79bb71a Add test for muting functionality. lain 2019-02-20 13:47:44 +0100
  • 840d2c9f0b Remove superfluous migration. lain 2019-02-20 13:47:24 +0100
  • 3ad91ec3c1 [#468] Adjusted scope restriction for MastodonAPIController#index. Ivan Tashkinov 2019-02-20 14:05:02 +0300
  • 337367d764 [#468] More OAuth scopes-specific tests. Ivan Tashkinov 2019-02-20 12:27:28 +0300
  • abd0b85efd Merge branch 'set-activation-status-admin-api' into 'develop' kaniini 2019-02-19 22:45:51 +0000
  • 5a46d37af9 Update the mute implementation to the current codebase Ekaterina Vaartis 2019-02-19 23:09:16 +0300
  • 04ee877a20 [#468] Added OAuth scopes-specific tests. Ivan Tashkinov 2019-02-19 22:28:21 +0300
  • 465b547c90 Remove unused "muted" parameter, use piping for mute/block fns Ekaterina Vaartis 2018-09-04 00:20:22 +0300
  • 092b1b1453 Do not unfollow muted users Ekaterina Vaartis 2018-09-04 00:17:25 +0300
  • ad2cf4fd86 Add test for mastodon muting endpoints Ekaterina Vaartis 2018-09-02 00:34:15 +0300
  • da64ea4a55 Implement mastodon mutes endpoint Ekaterina Vaartis 2018-09-02 00:33:13 +0300
  • f41f017bbc Implement muting, add it to the mastodon API Ekaterina Vaartis 2018-09-05 23:49:15 +0300
  • f4bfc628ca
    Player: allow styles on CSP, loop videos href 2019-02-19 18:56:57 +0100
  • aa9af1d639
    CSP: Allow iframes on embed player href 2019-02-19 18:17:37 +0100
  • 2d21ea1a0e Merge branch 'develop' into fix/twittercards Mark Felder 2019-02-19 16:58:28 +0000
  • 10a11f083c
    Embed player suitable for Twitter Cards href 2019-02-19 17:39:42 +0100
  • 25b9e7a8c3 Added admin API for changing user activation status eugenijm 2019-02-19 18:40:57 +0300
  • c0ecbf6669 [#468] Merged upstream/develop. Ivan Tashkinov 2019-02-19 19:10:55 +0300