Commit graph

  • 3c04460c9c Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop' kaniini 2019-03-08 00:42:17 +0000
  • 05cad042ba
    Update Mastodon Frontend to 2019-03-07 bundle Haelwenn (lanodan) Monnier 2019-03-07 11:56:02 +0100
  • 2a9191a53e Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop' rinpatch 2019-03-07 16:42:05 +0000
  • 8e9f6d8f69 Merge branch 'update/pleroma-fe-20190307' into 'develop' kaniini 2019-03-07 13:36:50 +0000
  • 3a097bd770 update pleroma frontend William Pitcock 2019-03-07 13:31:03 +0000
  • 3c5926fe91 tests: add regression test William Pitcock 2019-03-07 12:20:04 +0000
  • e53a9fd15e MRF: anti followbot: gracefully handle accounts without a display name William Pitcock 2019-03-07 12:13:48 +0000
  • 992145e64c Merge branch 'bugfix/delete-activity-audience' into 'develop' rinpatch 2019-03-07 11:31:08 +0000
  • c2faae70df Adjust delete activity audience to match the deleted object Karen Konou 2019-03-07 12:26:03 +0100
  • 6a69ece437 Revert existing object check Karen Konou 2019-03-07 11:53:15 +0100
  • ed5a1bbdfc Merge branch 'preserve-link-headers' into 'develop' lambda 2019-03-07 09:33:54 +0000
  • 7342b5a45f Preserve parameters in link headers (Mastodon API) eugenijm 2019-03-07 05:29:42 +0300
  • 0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop' kaniini 2019-03-06 22:27:42 +0000
  • 39b766cc43 Merge branch 'bugfix/connect-src-https' into 'develop' kaniini 2019-03-06 13:22:02 +0000
  • 07f8c79a69 Merge branch 'bugfix/rel-me_list' into 'develop' kaniini 2019-03-06 13:20:51 +0000
  • d249ea8e7c Merge branch 'feature/647' into 'develop' kaniini 2019-03-06 13:20:12 +0000
  • bc7570c282 [#647] tests for web push Maksim 2019-03-06 13:20:12 +0000
  • 4cbaab2181 Merge branch 'features/masto_fe-config' into 'develop' kaniini 2019-03-06 13:19:26 +0000
  • 76160122f6 Keep heading short Maxim Filippov 2019-03-06 05:01:38 +0300
  • 96901b6554 Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop' Haelwenn 2019-03-06 01:45:17 +0000
  • a283a1fcd0
    Add default config for masto_fe Haelwenn (lanodan) Monnier 2019-03-06 02:25:13 +0100
  • 28d5b40d0a Add handling of objects not in database Karen Konou 2019-03-05 23:15:22 +0100
  • 40ff8f5964 Add tests for reserved char escaping in upload rinpatch 2019-03-05 19:28:58 +0300
  • 4263edc9c9 Properly escape reserved URI charachters in upload urls rinpatch 2019-03-05 18:09:23 +0300
  • bcd8ef65e0 Merge branch 'add-admin-to-node-info' into 'develop' rinpatch 2019-03-05 07:05:44 +0000
  • 788a354ce0
    Web.RelMe: Fix having other values in rel attr Haelwenn (lanodan) Monnier 2019-03-05 02:03:44 +0100
  • fc37e5815f
    Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src Haelwenn (lanodan) Monnier 2019-03-05 01:44:24 +0100
  • 682cc94db1 Merge branch 'bugfix/rich-media-uri-validation' into 'develop' Haelwenn 2019-03-05 00:33:04 +0000
  • d1de0a30cc Include admins in nodeinfo eugenijm 2019-03-04 22:14:04 +0300
  • 2d30fc279f Typo Maxim Filippov 2019-03-05 02:11:15 +0300
  • b7aa1ea9e6 rich media: helpers: rework validate_page_url() William Pitcock 2019-03-04 18:38:23 +0000
  • 02359d686c local -> only_local Maxim Filippov 2019-03-04 21:36:47 +0300
  • e34710b988 Format & update docs Maxim Filippov 2019-03-04 21:33:53 +0300
  • 9f3cb38012 helpers: use AutoLinker to validate URIs as well as the other tests William Pitcock 2019-03-02 12:22:02 +0000
  • d7a278a733 tests: add tests for rich media helper functions William Pitcock 2019-02-24 19:39:27 +0000
  • d38d537bee rich media: don't crawl bogus URIs William Pitcock 2019-02-24 19:13:46 +0000
  • d45dbdce5a Merge branch 'feature/add-status-text-to-notifications' into 'develop' kaniini 2019-03-04 18:29:13 +0000
  • f620199836 Merge search endpoint into /users Maxim Filippov 2019-03-04 21:26:32 +0300
  • 0245ce842f Remove unused code Maxim Filippov 2019-03-04 20:49:20 +0300
  • cc7b35e097 Add status text to notifications (mentions and reposts) Maxim Filippov 2019-03-04 20:47:34 +0300
  • ca5d894e68 Merge branch 'fix/like-adressing' into 'develop' kaniini 2019-03-04 15:59:57 +0000
  • 33c614bce0 Stop adresssing like activities to actor's follower collection on non-public posts rinpatch 2019-03-04 18:09:58 +0300
  • 10248d86a2 Merge branch 'unify-follow' into 'develop' kaniini 2019-03-04 13:25:32 +0000
  • c63a45cd0e Merge branch 'dm-visibility-for-blocking-users' into 'develop' kaniini 2019-03-04 13:20:17 +0000
  • bf43f055dd Set content types settings on mastofe endpoint. KokaKiwi 2019-02-18 00:21:13 +0100
  • b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy. KokaKiwi 2019-03-03 18:33:02 +0100
  • 896f8580dd Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience Karen Konou 2019-03-04 11:22:17 +0100
  • 1445dc25d4 fix format Karen Konou 2019-03-04 11:18:16 +0100
  • aab86698a5 Expand "to" of delete activities Karen Konou 2019-03-04 10:47:04 +0100
  • 8302cdb5dc Expand "to" of delete activities Karen Konou 2019-03-04 10:47:04 +0100
  • 86e4b48a5e Fix DM visibility for blocking users eugenijm 2019-03-04 02:59:54 +0300
  • 594694607c Unify Mastodon and Twitter follow implementations using CommonAPI eugenijm 2019-03-04 00:50:00 +0300
  • dd5865535e Merge branch 'muting' into 'develop' kaniini 2019-03-03 21:10:10 +0000
  • 818a7894da Don't stream muted accounts William Pearson 2019-01-20 04:28:34 +0000
  • 88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well link0ff 2019-03-03 21:20:36 +0200
  • 8543e7f760 Merge branch 'remove-todo-txt' into 'develop' rinpatch 2019-03-03 17:39:46 +0000
  • 9962121bff Remove TODO.txt rinpatch 2019-03-03 20:32:46 +0300
  • 19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support link0ff 2019-03-03 18:29:37 +0200
  • ace4231628 Merge branch 'features/bio_rel_me' into 'develop' kaniini 2019-03-03 16:00:49 +0000
  • 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop' kaniini 2019-03-03 15:59:15 +0000
  • b531e366df Merge branch 'get-follow-requests-sql' into 'develop' kaniini 2019-03-03 15:51:32 +0000
  • 413cf00cc3 Merge branch 'atomic-note-count-updates' into 'develop' kaniini 2019-03-03 15:50:41 +0000
  • c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop' kaniini 2019-03-03 15:49:19 +0000
  • dfdbb6f125 Merge branch 'remove-follow-request-count' into 'develop' kaniini 2019-03-03 15:48:00 +0000
  • d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore. eugenijm 2019-03-03 18:39:37 +0300
  • af0039a3a0 Use atomic update for note count and follower count eugenijm 2019-03-03 17:27:09 +0300
  • 8a1e0c9bee Added migration to update existing user note counters eugenijm 2019-03-03 15:35:32 +0300
  • 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' lambda 2019-03-03 11:13:59 +0000
  • c46950d3b1 Increment user note count only on public activities eugenijm 2019-03-03 13:21:03 +0300
  • 1a1f4520cd Use sql query in User.get_follow_requests/1 for filtering logic eugenijm 2019-03-02 22:18:51 +0300
  • 08c6aeeed7 Add docs Maxim Filippov 2019-03-02 17:32:46 +0300
  • bf30df99cb We do not guarantee the order of elements when we search Maxim Filippov 2019-03-02 17:32:40 +0300
  • 2ec8cf5665 Add pagination to search Maxim Filippov 2019-03-02 17:21:18 +0300
  • f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop' rinpatch 2019-03-02 06:39:07 +0000
  • f2452d5700
    Pleroma.User: mix format Haelwenn (lanodan) Monnier 2019-03-02 07:04:49 +0100
  • 7b9868f343
    Pleroma.UserTest: Add tests for rel=me Haelwenn (lanodan) Monnier 2019-03-02 06:59:09 +0100
  • 8e6f7fdb86
    RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil Haelwenn (lanodan) Monnier 2019-03-02 06:58:42 +0100
  • 39a5bea9b7
    Pleroma.User: Fix syntax and user.ap_id call Haelwenn (lanodan) Monnier 2019-03-02 06:57:28 +0100
  • 3d22642352
    Pleroma.User: Pass an array to profile_urls Haelwenn (lanodan) Monnier 2019-03-02 06:33:15 +0100
  • 9b83236fb0
    Pleroma.Web.RelMe: fixups Haelwenn (lanodan) Monnier 2019-03-02 06:32:03 +0100
  • 25e588496a
    Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe Haelwenn (lanodan) Monnier 2019-03-02 06:13:04 +0100
  • 56d4e39012
    Pleroma.User: Add rel=me to URLs where it linkbacks to the profile Haelwenn (lanodan) Monnier 2019-02-11 22:27:02 +0100
  • bb9e40968a
    Web.OAuth.OAuthControllerTest: Add test against token formatting Haelwenn (lanodan) Monnier 2019-03-02 04:10:43 +0100
  • b6a001a34c
    Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response Haelwenn (lanodan) Monnier 2019-03-02 04:04:16 +0100
  • f635b675b2 Refactor a little bit Maxim Filippov 2019-03-01 21:17:20 +0300
  • a25c1313ae Format Maxim Filippov 2019-03-01 21:07:05 +0300
  • aaa9fed1ca Fix user_test Maxim Filippov 2019-03-01 20:58:47 +0300
  • f384a9a256 Format Maxim Filippov 2019-03-01 20:23:19 +0300
  • f1a4c3163b Show current user in users list as well Maxim Filippov 2019-03-01 20:23:03 +0300
  • 5b08b470f6 Add "local" params to users search Maxim Filippov 2019-03-01 20:13:02 +0300
  • adac745512 Add docs to /users/search Maxim Filippov 2019-03-01 17:34:14 +0300
  • 9c6abec4d8 use commonapi.post instead of activitybulder rinpatch 2019-03-01 15:48:04 +0300
  • b91a6dd85e Merge branch 'hotfix/http-date-header' into 'develop' kaniini 2019-03-01 12:28:08 +0000
  • 689b0730f8 activitypub: fix date header format William Pitcock 2019-03-01 12:21:09 +0000
  • 1fc1b0d935 Merge branch 'default-tags-for-existing-users' into 'develop' kaniini 2019-03-01 11:09:36 +0000
  • 85734c0d49 Added migration for setting default tags in existing users records eugenijm 2019-03-01 13:25:32 +0300
  • 2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' lambda 2019-03-01 09:48:24 +0000
  • b37b26ab87 Merge branch 'feature/cowboy2' into 'develop' lambda 2019-03-01 09:42:34 +0000
  • 1341ee650e [#675] Do not show DMs in mentions timeline rinpatch 2019-03-01 09:37:29 +0300
  • 6b2a1ad1c8 config: fix chat endpoint path William Pitcock 2019-02-28 16:58:00 +0000