Commit Graph

  • 5739c498c0
    fix for gun connections pool Alexander Strizhakov 2020-04-08 18:46:01 +03:00
  • 3775683a04 ChatMessage: Basic incoming handling. lain 2020-04-08 15:55:43 +02:00
  • d9f36965f6 pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f rinpatch 2020-04-08 16:24:45 +03:00
  • a8d98ba3aa CHANGELOG.md: update 2.0.2 release date rinpatch 2020-04-08 00:39:55 +03:00
  • 8593867c47 CHANGELOG.md: add 2.0.2 update notes rinpatch 2020-04-08 00:38:48 +03:00
  • c0a630d42f Update AdminFE build in preparation for Pleroma 2.0.2 Mark Felder 2020-03-31 13:05:16 -05:00
  • 94240cac4e Merge branch 'fix-auto-link-for-profile-fields' into 'develop' rinpatch 2020-04-07 11:41:10 +00:00
  • ae937bcaa1 CHANGELOG.md: add entries for funkwhale-related changes rinpatch 2020-04-02 23:37:14 +03:00
  • 1a4875adfa [#1559] Support for "follow_request" notifications (configurable). (Not currently supported by PleromaFE, thus disabled by default). Ivan Tashkinov 2020-04-07 21:52:32 +03:00
  • 76ebd25344 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-07 11:43:46 -05:00
  • dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop' rinpatch 2020-04-07 11:41:10 +00:00
  • 2b7d7bbd2d Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-04-07 14:09:43 +03:00
  • 06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs kPherox 2020-04-07 08:44:53 +00:00
  • e61add1a34
    more debug debug-remote-ip Alexander Strizhakov 2020-04-07 10:19:44 +03:00
  • be9f90e755
    http debug Alexander Strizhakov 2020-04-07 08:48:26 +03:00
  • 282f45ed43 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-06 20:42:45 -05:00
  • 19335be24c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-06 17:50:31 +02:00
  • 77c13aeecc
    more debug Alexander Strizhakov 2020-04-03 18:20:42 +03:00
  • bced14a225
    debug remote ip Alexander Strizhakov 2020-04-03 17:19:20 +03:00
  • 03eebabe8e
    Add Pleroma.Web.ApiSpec.Helpers Egor Kislitsyn 2020-04-03 22:52:25 +04:00
  • 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' lain 2020-04-06 12:51:35 +00:00
  • 96ee0aadbf Merge branch 'improving-test-coverage' into 'develop' lain 2020-04-06 12:49:17 +00:00
  • 349b9d86dc Merge branch 'remake-remodel-2' into 'develop' lain 2020-04-06 11:59:01 +00:00
  • 772bc258cd ObjectID Validator: Refactor. lain 2020-04-06 13:53:24 +02:00
  • e67cde0ed6 Transmogrifier: Refactoring / Renaming. lain 2020-04-06 13:46:34 +02:00
  • a43e055916
    using another fn for file deletion Alexander Strizhakov 2020-04-06 14:27:20 +03:00
  • b59ac37b2c
    tests for emoji mix task Alexander Strizhakov 2020-04-06 10:45:25 +03:00
  • fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled). Ivan Tashkinov 2020-04-06 10:20:44 +03:00
  • d61d55f908 Merge branch 'revert-65034cd8' into 'neckbeard' Your New SJW Waifu 2020-04-03 09:04:11 +00:00
  • cf563451ae Revert "Merge branch 'revert-76fc9276' into 'neckbeard'" Your New SJW Waifu 2020-04-03 09:03:38 +00:00
  • 3195e74afd Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-03 03:57:25 -05:00
  • 06444a1501 Merge branch 'bugfix/earmark_renderer_test' into 'develop' rinpatch 2020-03-15 20:04:31 +00:00
  • b0a9a02af3 Merge branch 'feature/funkwhale-audio' into 'develop' Haelwenn 2020-03-29 19:18:22 +00:00
  • 01a3f145d5 Merge branch 'bugfix/funkwhale-channel' into 'develop' Haelwenn 2020-03-31 22:04:02 +00:00
  • 8444e7ee96 Merge branch 'fix/docs-markdown' into 'develop' feld 2020-04-02 19:36:55 +00:00
  • 8a0ffaa9ea
    Fix formatting in documentation Egor Kislitsyn 2020-04-02 23:01:29 +04:00
  • 7879369e4d Merge branch '2323-accounts-relationships-hotfix' into 'develop' feld 2020-04-02 16:48:47 +00:00
  • 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses Ivan Tashkinov 2020-04-02 19:38:39 +03:00
  • aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests. Ivan Tashkinov 2020-04-02 19:23:30 +03:00
  • 0aa24a150b
    Add oAuth Egor Kislitsyn 2020-04-02 17:33:23 +04:00
  • fd97b0e634 Chats: Basic implementation. lain 2020-03-09 17:00:16 +01:00
  • dbcfac11b4 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-04-02 14:47:17 +03:00
  • 591f7015d9 update Oban package Maksim Pechnikov 2020-04-02 09:34:11 +03:00
  • e25e840ecc Merge branch 'neckbeard' of git.pleroma.social:sjw/pleroma into neckbeard Your New SJW Waifu 2020-04-01 19:59:57 -05:00
  • 65034cd8c8 Merge branch 'revert-76fc9276' into 'neckbeard' Your New SJW Waifu 2020-04-02 00:58:53 +00:00
  • 02160dbc03 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" Your New SJW Waifu 2020-04-02 00:57:27 +00:00
  • bd93e9b8c3 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-01 19:36:38 -05:00
  • 23219e6fb3
    Add OpenAPI Egor Kislitsyn 2020-04-01 23:00:59 +04:00
  • 2d64500a9d
    error improvement for email_invite endpoint Alexander Strizhakov 2020-04-01 20:26:33 +03:00
  • fd932b14a7 Merge branch 'update/adminfe-20200331' into 'develop' feld 2020-04-01 17:12:59 +00:00
  • 76fc927650 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-04-01 12:12:21 -05:00
  • 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses Ivan Tashkinov 2020-04-01 20:08:14 +03:00
  • ef7d2b0f11 Merge branch 'gun' into 'develop' feld 2020-04-01 17:05:09 +00:00
  • 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. See [:extensions, output_relationships_in_statuses_by_default] setting and with_relationships param. Ivan Tashkinov 2020-04-01 19:49:09 +03:00
  • 037b49c415 Validators: Correct ObjectID filename lain 2020-04-01 16:10:17 +02:00
  • bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop' rinpatch 2020-04-01 12:55:52 +00:00
  • 94ddbe4098
    restrict remote users from indexing Alexander Strizhakov 2020-04-01 09:55:05 +03:00
  • c9f51edea1 Merge branch 'ops/fix-ci' into 'develop' Haelwenn 2020-04-01 03:44:47 +00:00
  • bcaaba4660 remove testing only: in docker build jp 2020-03-31 22:16:36 -04:00
  • c2715ed772 add imagemagick and update inherited container to alpine:3.11 jp 2020-03-31 21:31:23 -04:00
  • ec5d6eef6a Merge branch 'fix/docker-mogrify' into 'develop' feld 2020-03-31 22:32:48 +00:00
  • d3cd3b96bf Remove problematic --cache-from argument Mark Felder 2020-03-31 17:28:41 -05:00
  • 7d3b25f0e1 Merge branch 'bugfix/funkwhale-channel' into 'develop' Haelwenn 2020-03-31 22:04:02 +00:00
  • 185520d1b4
    Provide known-good user.uri, remove User.profile_url/1 Haelwenn (lanodan) Monnier 2020-03-30 02:01:09 +02:00
  • b30fb1f3bb
    User: Fix use of source_data in profile_url/1 Haelwenn (lanodan) Monnier 2020-03-29 22:30:50 +02:00
  • 2553400a66
    Initial failing test statement against funkwhale channels Haelwenn (lanodan) Monnier 2020-03-29 22:01:49 +02:00
  • fa38089f16 Merge branch 'fix/docker-mogrify' into 'develop' feld 2020-03-31 19:36:04 +00:00
  • f6dc33615b Add imagemagick to Docker image to fix broken mogrify plugin Mark Felder 2020-03-31 14:29:43 -05:00
  • e7048471e0
    Write both summary and content searches in the same where to keep other conditions feature/add-subject-to-text-search Sergey Suprunenko 2020-03-31 20:49:54 +02:00
  • 219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2 Mark Felder 2020-03-31 13:05:16 -05:00
  • 7408f003a6
    Use Pleroma.Formatter.linkify instead of AutoLinker.link kPherox 2020-03-31 11:13:53 +00:00
  • dbf9d719f9
    split test for update profile fields kPherox 2020-04-01 00:05:13 +09:00
  • c982093cc2 Transmogrifier: Fix BAD code by RINPATCH lain 2020-03-31 19:33:41 +02:00
  • 1b323ce1c6 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:28:18 +00:00
  • ecac57732a Transmogrifier: Only add context if it really is onne. lain 2020-03-31 19:16:45 +02:00
  • 6650c69aaf
    Add activity summary to RUM full text search Sergey Suprunenko 2020-03-31 19:10:10 +02:00
  • 72ef8bc7b0
    Add activity summary to GIN full text search Sergey Suprunenko 2020-03-31 19:09:34 +02:00
  • 51fc504705 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-31 19:06:08 +02:00
  • 288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:00:55 +00:00
  • 0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:00:48 +00:00
  • 057438a657 CommonAPI: DRY up a bit. lain 2020-03-31 17:56:05 +02:00
  • aebec1bac9 Validator Test: Small refactor. lain 2020-03-31 17:47:34 +02:00
  • 7af0959a07
    updating docs Alexander Strizhakov 2020-03-31 18:30:19 +03:00
  • df5f89c0d6
    test for default features and changelog entry Alexander Strizhakov 2020-03-31 18:22:25 +03:00
  • 643f15e77b Validators: ObjectID is an http uri. lain 2020-03-31 16:11:38 +02:00
  • d191b0942f
    Remove no longer used function kPherox 2020-03-31 22:48:42 +09:00
  • f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 12:55:25 +00:00
  • e97b50d17a Merge branch 'fix-testing' into 'develop' lain 2020-03-19 18:10:39 +00:00
  • a674094ec6 mix.exs bump version to 2.0.2 rinpatch 2020-03-31 14:02:51 +03:00
  • 78b6549611 CHANGELOG.md: Add 2.0.2 entry rinpatch 2020-03-31 13:59:26 +03:00
  • 540dd38a5e Merge branch 'docs/mrf_object_age' into 'develop' Haelwenn 2020-03-16 17:42:10 +00:00
  • 0c010c292e Merge branch 'fix/ecto_ssl_option' into 'develop' rinpatch 2020-03-22 14:32:40 +00:00
  • e99e2a86af Merge branch 'bugfix/profile-bio-newline' into 'develop' rinpatch 2020-03-23 19:32:01 +00:00
  • c4d3ccc7b9 Merge branch 'admin-api-change-password' into 'develop' lain 2020-03-24 17:34:13 +00:00
  • 10b7b2b4a4 Merge branch 'fix/activity-deletion' into 'develop' feld 2020-03-24 19:10:32 +00:00
  • 0e92aa0025 Merge branch '1364-notifications-sending-control' into 'develop' rinpatch 2020-03-25 18:00:24 +00:00
  • ea9c57b26e [#2332] Misc. improvements per code change requests. Ivan Tashkinov 2020-03-31 09:21:42 +03:00
  • 9c94b6a327 [#2332] Misc. fixes per code change requests. Ivan Tashkinov 2020-03-30 19:08:37 +03:00
  • 8bd5ad8664 Merge branch 'benchmark-improvements' into 'develop' lain 2020-03-30 14:48:00 +00:00
  • dabe3aeb9e Merge branch 'removing-grouped-reports' into 'develop' rinpatch 2020-03-30 12:38:21 +00:00