Commit Graph

  • d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore. eugenijm 2019-03-03 18:39:37 +03:00
  • af0039a3a0 Use atomic update for note count and follower count eugenijm 2019-03-03 17:27:09 +03:00
  • 8a1e0c9bee Added migration to update existing user note counters eugenijm 2019-03-03 15:35:32 +03:00
  • 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' lambda 2019-03-03 11:13:59 +00:00
  • c46950d3b1 Increment user note count only on public activities eugenijm 2019-03-03 13:21:03 +03:00
  • 1a1f4520cd Use sql query in User.get_follow_requests/1 for filtering logic eugenijm 2019-03-02 22:18:51 +03:00
  • 08c6aeeed7 Add docs Maxim Filippov 2019-03-02 17:32:46 +03:00
  • bf30df99cb We do not guarantee the order of elements when we search Maxim Filippov 2019-03-02 17:32:40 +03:00
  • 2ec8cf5665 Add pagination to search Maxim Filippov 2019-03-02 17:21:18 +03:00
  • f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop' rinpatch 2019-03-02 06:39:07 +00:00
  • f2452d5700
    Pleroma.User: mix format Haelwenn (lanodan) Monnier 2019-03-02 07:04:49 +01:00
  • 7b9868f343
    Pleroma.UserTest: Add tests for rel=me Haelwenn (lanodan) Monnier 2019-03-02 06:59:09 +01:00
  • 8e6f7fdb86
    RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil Haelwenn (lanodan) Monnier 2019-03-02 06:58:42 +01:00
  • 39a5bea9b7
    Pleroma.User: Fix syntax and user.ap_id call Haelwenn (lanodan) Monnier 2019-03-02 06:57:28 +01:00
  • 3d22642352
    Pleroma.User: Pass an array to profile_urls Haelwenn (lanodan) Monnier 2019-03-02 06:33:15 +01:00
  • 9b83236fb0
    Pleroma.Web.RelMe: fixups Haelwenn (lanodan) Monnier 2019-03-02 06:32:03 +01:00
  • 25e588496a
    Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe Haelwenn (lanodan) Monnier 2019-03-02 06:13:04 +01:00
  • 56d4e39012
    Pleroma.User: Add rel=me to URLs where it linkbacks to the profile Haelwenn (lanodan) Monnier 2019-02-11 22:27:02 +01:00
  • bb9e40968a
    Web.OAuth.OAuthControllerTest: Add test against token formatting Haelwenn (lanodan) Monnier 2019-03-02 04:10:43 +01:00
  • b6a001a34c
    Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response Haelwenn (lanodan) Monnier 2019-03-02 04:04:16 +01:00
  • f635b675b2 Refactor a little bit Maxim Filippov 2019-03-01 21:17:20 +03:00
  • a25c1313ae Format Maxim Filippov 2019-03-01 21:07:05 +03:00
  • aaa9fed1ca Fix user_test Maxim Filippov 2019-03-01 20:58:47 +03:00
  • f384a9a256 Format Maxim Filippov 2019-03-01 20:23:19 +03:00
  • f1a4c3163b Show current user in users list as well Maxim Filippov 2019-03-01 20:23:03 +03:00
  • 5b08b470f6 Add "local" params to users search Maxim Filippov 2019-03-01 20:13:02 +03:00
  • adac745512 Add docs to /users/search Maxim Filippov 2019-03-01 17:34:14 +03:00
  • 9c6abec4d8 use commonapi.post instead of activitybulder rinpatch 2019-03-01 15:48:04 +03:00
  • b91a6dd85e Merge branch 'hotfix/http-date-header' into 'develop' kaniini 2019-03-01 12:28:08 +00:00
  • 689b0730f8 activitypub: fix date header format William Pitcock 2019-03-01 12:21:09 +00:00
  • 1fc1b0d935 Merge branch 'default-tags-for-existing-users' into 'develop' kaniini 2019-03-01 11:09:36 +00:00
  • 85734c0d49 Added migration for setting default tags in existing users records eugenijm 2019-03-01 13:25:32 +03:00
  • 2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' lambda 2019-03-01 09:48:24 +00:00
  • b37b26ab87 Merge branch 'feature/cowboy2' into 'develop' lambda 2019-03-01 09:42:34 +00:00
  • 1341ee650e [#675] Do not show DMs in mentions timeline rinpatch 2019-03-01 09:37:29 +03:00
  • 6b2a1ad1c8 config: fix chat endpoint path William Pitcock 2019-02-28 16:58:00 +00:00
  • 28b4093233 mastodon websocket: return errors using ok, not stop William Pitcock 2019-02-28 16:23:55 +00:00
  • 388a3f4ca2 mastodon websocket: bring back infinity timeout William Pitcock 2019-02-28 16:23:24 +00:00
  • 46f29b9da1 Add search users endpoint Maxim Filippov 2019-02-28 19:04:47 +03:00
  • f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors William Pitcock 2019-02-28 16:02:48 +00:00
  • 9aec00d711 config: update config for cowboy 2 endpoints William Pitcock 2019-02-28 15:43:38 +00:00
  • bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x William Pitcock 2019-02-28 15:17:01 +00:00
  • e10ca35b3d mix: update dependencies for cowboy 2.0 William Pitcock 2019-02-28 14:53:54 +00:00
  • 70e82a3465 Add test for the second page Maxim Filippov 2019-02-28 17:54:02 +03:00
  • 72b7a0797e Use Mastodon API views in Admin API Maxim Filippov 2019-02-28 17:43:09 +03:00
  • a47cc5a2cf Merge branch 'customizable_auth' into 'develop' href 2019-02-28 11:18:01 +00:00
  • 3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. Ivan Tashkinov 2019-02-28 14:12:41 +03:00
  • 4e77f68414 Added auth_template/0 to DatabaseAuthenticator. Ivan Tashkinov 2019-02-28 13:58:58 +03:00
  • cf426a719d Merge branch 'with-mutes' into 'develop' kaniini 2019-02-28 10:22:19 +00:00
  • 90a24fbf95 Merge branch 'customizable_auth' into 'develop' href 2019-02-28 10:12:26 +00:00
  • 089e2588a3 Merge branch 'speedup-follow-requests' into 'develop' kaniini 2019-02-28 10:10:03 +00:00
  • 3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop' kaniini 2019-02-28 10:08:31 +00:00
  • b6f915313f Made auth customization be runtime-configurable. Ivan Tashkinov 2019-02-28 13:00:54 +03:00
  • 9cc98b496e Merge branch 'feature/mastoapi-embedded-relationships' into 'develop' lambda 2019-02-28 07:35:26 +00:00
  • 6b11011039 Added deactivated to the user view eugenijm 2019-02-28 08:31:33 +03:00
  • 2883f75a3a Add pagination to users admin API Maxim Filippov 2019-02-28 01:11:56 +03:00
  • bbbdbec4fd Remove parts of the old activity view. lain 2019-02-27 17:24:51 +01:00
  • 9ade1242c2 Add user muted status info to twitterapi. lain 2019-02-27 16:52:03 +01:00
  • c1ae495878 Add user muted status info to MastodonAPI. lain 2019-02-27 16:46:47 +01:00
  • c4235f96bd Add with_muted param. lain 2019-02-27 16:37:42 +01:00
  • b24cc44e8d Follower requests: Utilize object index. lain 2019-02-27 15:01:54 +01:00
  • 8d8cb08f94 Add follow request test. lain 2019-02-27 14:51:07 +01:00
  • 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience William Pitcock 2019-02-27 13:01:10 +00:00
  • 14bc6bd40f Merge branch 'fix/formatter' into 'develop' kaniini 2019-02-27 08:45:43 +00:00
  • 5d961d536c fix formatter Egor Kislitsyn 2019-02-27 15:40:30 +07:00
  • a50a47a011 Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop' kaniini 2019-02-27 07:28:10 +00:00
  • ed7fd6b47e Add missing docs and tests Maxim Filippov 2019-02-27 03:08:03 +03:00
  • 1c265b3b19 Merge branch 'auto_linker' into 'develop' kaniini 2019-02-26 23:32:26 +00:00
  • c3ac9424d2 AutoLinker Egor 2019-02-26 23:32:26 +00:00
  • e9703a5326 Merge branch 'feature/more-actions-to-admin-api' into 'develop' kaniini 2019-02-26 23:31:53 +00:00
  • 90d0d055fc Add more admin actions Maxim Filippov 2019-02-27 00:13:38 +03:00
  • b985c91431 Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop' kaniini 2019-02-26 16:47:18 +00:00
  • e1bdaaa3fe need to put back ipv4 listen instruct Kenneth Zhao 2019-02-26 08:41:37 -08:00
  • e98d34e5fb Added missing copyright headers. Ivan Tashkinov 2019-02-26 16:26:54 +03:00
  • fd46edb473 Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth Ivan Tashkinov 2019-02-26 15:29:43 +03:00
  • e82b70eb53 Database authenticator behaviour / Pleroma implementation refactoring. Ivan Tashkinov 2019-02-26 15:27:01 +03:00
  • 03afee3fd1 Merge branch 'nginx-cfg' into 'develop' Haelwenn 2019-02-26 06:56:29 +00:00
  • d3a6c065a4 Add ipv6 handling to pleroma.nginx PEA 2019-02-25 23:37:46 -05:00
  • 2ed7003c26 Merge branch 'trivial/remove-io-inspect-spam' into 'develop' kaniini 2019-02-24 19:03:58 +00:00
  • fc9d895ebc twitter card: remove IO.inspect() spam William Pitcock 2019-02-24 18:53:49 +00:00
  • efa506b874 delegate user retrieval to the User module 11backslashes 2019-02-24 13:23:47 -05:00
  • 7daa9a8c42 Merge branch 'add-apache-cache-config' into 'develop' kaniini 2019-02-23 04:01:21 +00:00
  • 101c20f8d9 Merge branch 'card-handling' into 'develop' kaniini 2019-02-23 03:59:23 +00:00
  • ab2d2dfa7b Merge branch 'fix/meck' into 'develop' kaniini 2019-02-23 03:56:31 +00:00
  • c75e643a72
    apache config: add instructions for mediaproxy. faried nawaz 2019-02-23 00:18:03 +05:00
  • bf562a6ecc Upate meck to fix tests on MacOS Mark Felder 2019-02-22 17:26:47 +00:00
  • e278d47023 OpenLDAP support link0ff 2019-02-22 15:03:43 +02:00
  • 9e0686efa6 Move visibility into own module. lain 2019-02-22 13:29:52 +01:00
  • 34646c6923 Merge branch 'oauth2_scopes_migration_hotfix' into 'develop' href 2019-02-22 11:16:10 +00:00
  • 62296f5a25 Fix private post card handling. lain 2019-02-22 12:02:51 +01:00
  • b227ccab82 Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope. Ivan Tashkinov 2019-02-22 14:00:18 +03:00
  • afddce45b3 Minor setting name adjustment (:app_template -> :app_layout). Ivan Tashkinov 2019-02-22 11:10:17 +03:00
  • 5a4e2905fe Merge branch 'fix/twittercards' into 'develop' kaniini 2019-02-22 04:38:14 +00:00
  • eeeb8124b9 Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop' kaniini 2019-02-22 04:37:48 +00:00
  • 7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty KZ 2019-02-22 04:37:48 +00:00
  • 1097ce6d9f Auth customization support. OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection. Ivan Tashkinov 2019-02-21 18:55:19 +03:00
  • 2813f28b6f Merge branch 'bugfix/httpsig-sign-date' into 'develop' lambda 2019-02-21 08:20:06 +00:00
  • 19bd799bd7 Merge branch 'bugfix/as2-accept-json' into 'develop' lambda 2019-02-21 08:14:24 +00:00
  • 45b06860d3 Merge branch '2019-02-21-update-frontend' into 'develop' lambda 2019-02-21 08:11:06 +00:00
  • 553ce57d42 update frontend lain 2019-02-21 09:04:35 +01:00