phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • a927215e85 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-17 18:51:19 -05:00
  • d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs Haelwenn 2020-04-17 22:48:40 +00:00
  • 24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex Haelwenn 2020-04-17 22:48:37 +00:00
  • eb61564005
         migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Haelwenn (lanodan) Monnier 2020-04-17 23:55:56 +02:00
  • 48f9835f8d cleanup Roman Chvanikov 2020-04-18 00:47:45 +03:00
  • f1843db41d Merge branch '1682-basic-auth-permissions-fix' into 'develop' rinpatch 2020-04-17 20:47:43 +00:00
  • 1cb584cde7 Merge develop Roman Chvanikov 2020-04-17 23:11:24 +03:00
  • e303d80dcb Merge branch 'update/pleroma-fe-20200417' into 'develop' Haelwenn 2020-04-17 19:21:34 +00:00
  • 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 Mark Felder 2020-04-17 13:22:25 -05:00
  • 66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality. Ivan Tashkinov 2020-04-17 21:21:10 +03:00
  • a6ea8871e6 Add copyright headers Roman Chvanikov 2020-04-17 19:06:31 +03:00
  • f6aa387195 Set configs back to normal Roman Chvanikov 2020-04-17 18:59:58 +03:00
  • 8cf7774434 Fix instance/static overridable paths Roman Chvanikov 2020-04-17 18:40:52 +03:00
  • 863e61ad5f FE bundles Roman Chvanikov 2020-04-17 18:36:32 +03:00
  • 163341857a
         Improve OpenAPI errors Egor Kislitsyn 2020-04-17 19:27:22 +04:00
  • fca2c98a6a Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-17 10:10:40 -05:00
  • c845820911 Notifications: Create a chat notification. lain 2020-04-17 16:55:01 +02:00
  • e0d7847bc5 Merge branch 'sideeffects-test' into 'develop' rinpatch 2020-04-17 14:03:04 +00:00
  • 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-17 15:51:24 +02:00
  • 26d9c83316 SideEffects: Test for notification creation. lain 2020-04-17 15:50:15 +02:00
  • 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' rinpatch 2020-04-17 13:40:25 +00:00
  • 372614cfd3 ChatView: Add a mastodon api representation of the recipient. lain 2020-04-17 14:23:59 +02:00
  • 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications Ivan Tashkinov 2020-04-17 16:23:58 +03:00
  • 46f051048f
         migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Haelwenn (lanodan) Monnier 2020-04-17 14:32:15 +02:00
  • d45ae64858 ChatController: Use OAuth scopes. lain 2020-04-17 13:04:46 +02:00
  • f1f7998e78 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-17 05:43:47 -05:00
  • 6cda360fea
         don't restart postgrex Alexander Strizhakov 2020-04-16 10:36:37 +03:00
  • 09bd1d12c1 Merge branch 'sync-changelog' into 'develop' Haelwenn 2020-04-17 09:39:29 +00:00
  • 4d22b100b7
         move changelogs entries to unreleased section Alexander Strizhakov 2020-04-17 12:33:11 +03:00
  • a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop' Haelwenn 2020-04-17 09:19:35 +00:00
  • d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop' Haelwenn 2020-04-17 09:02:10 +00:00
  • 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' Haelwenn 2020-04-17 08:55:46 +00:00
  • 304ea09f4c
         fix for logger configuration Alexander Strizhakov 2020-04-17 08:42:48 +03:00
  • badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' rinpatch 2020-04-16 21:58:57 +00:00
  • 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop' rinpatch 2020-04-16 18:38:58 +00:00
  • 0ddee13c83 Merge branch 'features/remove-user-source_data' into 'develop' rinpatch 2020-04-16 18:37:56 +00:00
  • 942d7467ca Merge branch 'develop' into features/remove-user-source_data rinpatch 2020-04-16 21:28:52 +03:00
  • f8c3ae7a62 ChatController: Handle pagination. lain 2020-04-16 18:43:31 +02:00
  • e983f70884 ChatMessagesHandling: Strip HTML of incoming messages. lain 2020-04-16 17:50:24 +02:00
  • 4d330d9df1
         fix for use of published from different entities Alexander Strizhakov 2020-04-16 18:05:36 +03:00
  • 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop' rinpatch 2020-04-16 14:59:11 +00:00
  • 77ee64b993 user: remove blank? rinpatch 2020-04-16 17:54:57 +03:00
  • 41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-16 15:28:08 +02:00
  • ca598e9c27 AccountView: Return user ap_id. lain 2020-04-16 15:27:35 +02:00
  • e2ced04917 ChatMessages: Better validation. lain 2020-04-16 15:21:47 +02:00
  • 72ef6cc4f2
         added need_reboot endpoint to admin api Alexander Strizhakov 2020-04-13 14:07:23 +03:00
  • 3d4eca5dd4 CommonAPI: Escape HTML for chat messages. lain 2020-04-16 12:56:29 +02:00
  • 2b57f73b77 Merge branch 'small-fix-rewrite_policy' into 'develop' lain 2020-04-16 09:38:24 +00:00
  • 6a2d38e4ce Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-15 21:06:27 -05:00
  • cf4ebba774
         Cleanup SubscriptionController Egor Kislitsyn 2020-04-15 22:59:25 +04:00
  • 4b3b1fec4e added an endpoint for getting unread notification count Maksim Pechnikov 2020-04-15 21:19:43 +03:00
  • bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. Ivan Tashkinov 2020-04-15 21:19:16 +03:00
  • aa0a4a1e78 small fix in the rewrite_policy example Ilja 2020-04-15 19:03:27 +02:00
  • 6ace22b56a Chat: Add views, don't return them in timeline queries. lain 2020-04-15 18:23:16 +02:00
  • bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement Ivan Tashkinov 2020-04-15 19:20:34 +03:00
  • b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop' Haelwenn 2020-04-15 15:26:55 +00:00
  • 75ff35c599 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-15 10:19:29 -05:00
  • 65f04b7806
         Fix credo warning Egor Kislitsyn 2020-04-15 17:16:32 +04:00
  • 16f4787bf7
         Add a TODO note Egor Kislitsyn 2020-04-15 16:51:37 +04:00
  • 0e647ff55a
         Abstract pagination params in OpenAPI spec Egor Kislitsyn 2020-04-15 16:45:45 +04:00
  • 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-15 14:41:43 +02:00
  • 22bde21c4f
         remote_ip plug adds remote_ip_found flag Alexander Strizhakov 2020-04-15 15:27:34 +03:00
  • 8ed162b655 Fix formatting Egor Kislitsyn 2020-04-15 15:39:32 +04:00
  • 5a2e45a218 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 11:29:10 +00:00
  • 81a4c15816 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:48:52 +00:00
  • a45bd91d4e Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:48:32 +00:00
  • bfa26b0937 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:30:19 +00:00
  • a794ba655f Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:27:01 +00:00
  • a7feca1604 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:26:53 +00:00
  • d3e876aeee Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex minibikini 2020-04-15 10:26:44 +00:00
  • ad8630b95a Merge branch 'uploads-csp-changes' into 'develop' rinpatch 2020-04-15 10:15:15 +00:00
  • 6bc76df287 Uploads: Sandbox them in the CSP. lain 2020-04-15 12:05:22 +02:00
  • 8088ca84e8 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-14 17:32:04 -05:00
  • 96eae62995 Merge branch 'fix/openapi-form-mimetype' into 'develop' rinpatch 2020-04-14 22:01:24 +00:00
  • cc4ff19e34 openapi: add application/x-www-form-urlencoded to body types rinpatch 2020-04-15 00:49:21 +03:00
  • 6ea33979a3 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-14 15:09:00 -05:00
  • f7e623c11c [#1364] Resolved merge conflicts with develop. Ivan Tashkinov 2020-04-14 20:19:08 +03:00
  • 0cda80f266 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users Ivan Tashkinov 2020-04-14 20:10:02 +03:00
  • 6c3e09fbce Merge branch 'fix/richmedia-oban-error' into 'develop' feld 2020-04-14 17:05:17 +00:00
  • dde994c775 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-14 11:46:02 -05:00
  • 3bf78f2be7 Fix Oban not receiving :ok from RichMediaHelper job Mark Felder 2020-04-14 11:43:53 -05:00
  • c02e6ceea5 Merge branch 'revert-60cc7d6c' into 'develop' lain 2020-04-14 16:32:34 +00:00
  • 4576520461 Revert "Merge branch 'issue/1276' into 'develop'" lain 2020-04-14 16:32:22 +00:00
  • 3677a1e578 Merge branch 'revert-13a7105b' into 'develop' lain 2020-04-14 16:31:41 +00:00
  • 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'" lain 2020-04-14 16:31:30 +00:00
  • 247e6fcb90
         Merge branch 'develop' into openapi/account Egor Kislitsyn 2020-04-14 19:45:22 +04:00
  • bf3afbc1a1 Merge branch 'logger-configuration' into 'develop' feld 2020-04-14 15:11:25 +00:00
  • 13a7105b21 Merge branch 'marker-update-fix' into 'develop' lain 2020-04-14 13:17:44 +00:00
  • 5fc6ce30ac Merge branch 'chore/spelling' into 'develop' lain 2020-04-14 13:07:57 +00:00
  • d8b12ffd59 Marker update migration: Don't try to update virtual field. lain 2020-04-14 15:06:09 +02:00
  • 2eae5793cd Merge branch 'fix/issue_1679' into 'develop' lain 2020-04-14 11:08:33 +00:00
  • 650853fc89 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users Ivan Tashkinov 2020-04-14 11:58:38 +03:00
  • 60cc7d6c9a Merge branch 'issue/1276' into 'develop' Haelwenn 2020-04-14 06:38:56 +00:00
  • c4e7ed660c fix logger message Maksim Pechnikov 2020-04-14 08:43:47 +03:00
  • f3725b8fc4 Fix spelling Mark Felder 2020-04-13 17:04:43 -05:00
  • e3db1c471e Merge branch 'openapi/domain-blocks' into 'develop' rinpatch 2020-04-13 20:04:49 +00:00
  • 68d692d789 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-13 13:45:20 -05:00
  • 4dca712e90
         Add OpenAPI spec for DomainBlockController Egor Kislitsyn 2020-04-13 22:44:52 +04:00
  • a16b3dbcbf Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-04-13 21:19:27 +03:00
  • c28aaf9d82
         Add OpenAPI spec for CustomEmojiController Egor Kislitsyn 2020-04-13 21:21:04 +04:00