Commit graph

  • 0590d16089 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-04-07 18:02:33 +0100
  • dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop' rinpatch 2020-04-07 11:41:10 +0000
  • 2b7d7bbd2d Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-04-07 14:09:43 +0300
  • 06471940e0 Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs kPherox 2020-04-07 08:44:53 +0000
  • 19335be24c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-04-06 17:50:31 +0200
  • 8cec5796ae Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-04-06 14:44:26 +0100
  • 03eebabe8e
    Add Pleroma.Web.ApiSpec.Helpers Egor Kislitsyn 2020-04-03 22:52:25 +0400
  • 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' lain 2020-04-06 12:51:35 +0000
  • 96ee0aadbf Merge branch 'improving-test-coverage' into 'develop' lain 2020-04-06 12:49:17 +0000
  • 349b9d86dc Merge branch 'remake-remodel-2' into 'develop' lain 2020-04-06 11:59:01 +0000
  • 772bc258cd ObjectID Validator: Refactor. lain 2020-04-06 13:53:24 +0200
  • e67cde0ed6 Transmogrifier: Refactoring / Renaming. lain 2020-04-06 13:46:34 +0200
  • a43e055916
    using another fn for file deletion Alexander Strizhakov 2020-04-06 14:27:20 +0300
  • b59ac37b2c
    tests for emoji mix task Alexander Strizhakov 2020-04-06 10:45:25 +0300
  • 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 +0300
  • 06444a1501 Merge branch 'bugfix/earmark_renderer_test' into 'develop' rinpatch 2020-03-15 20:04:31 +0000
  • b0a9a02af3 Merge branch 'feature/funkwhale-audio' into 'develop' Haelwenn 2020-03-29 19:18:22 +0000
  • 01a3f145d5 Merge branch 'bugfix/funkwhale-channel' into 'develop' Haelwenn 2020-03-31 22:04:02 +0000
  • 8444e7ee96 Merge branch 'fix/docs-markdown' into 'develop' feld 2020-04-02 19:36:55 +0000
  • 8a0ffaa9ea
    Fix formatting in documentation Egor Kislitsyn 2020-04-02 23:01:29 +0400
  • 7879369e4d Merge branch '2323-accounts-relationships-hotfix' into 'develop' feld 2020-04-02 16:48:47 +0000
  • 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 +0300
  • aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests. Ivan Tashkinov 2020-04-02 19:23:30 +0300
  • 0aa24a150b
    Add oAuth Egor Kislitsyn 2020-04-02 17:33:23 +0400
  • fd97b0e634 Chats: Basic implementation. lain 2020-03-09 17:00:16 +0100
  • dbcfac11b4 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-04-02 14:47:17 +0300
  • 591f7015d9 update Oban package Maksim Pechnikov 2020-04-02 09:34:11 +0300
  • 23219e6fb3
    Add OpenAPI Egor Kislitsyn 2020-04-01 23:00:59 +0400
  • 2d64500a9d
    error improvement for email_invite endpoint Alexander Strizhakov 2020-04-01 20:26:33 +0300
  • fd932b14a7 Merge branch 'update/adminfe-20200331' into 'develop' feld 2020-04-01 17:12:59 +0000
  • 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses Ivan Tashkinov 2020-04-01 20:08:14 +0300
  • ef7d2b0f11 Merge branch 'gun' into 'develop' feld 2020-04-01 17:05:09 +0000
  • 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 +0300
  • 037b49c415 Validators: Correct ObjectID filename lain 2020-04-01 16:10:17 +0200
  • bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop' rinpatch 2020-04-01 12:55:52 +0000
  • 94ddbe4098
    restrict remote users from indexing Alexander Strizhakov 2020-04-01 09:55:05 +0300
  • c9f51edea1 Merge branch 'ops/fix-ci' into 'develop' Haelwenn 2020-04-01 03:44:47 +0000
  • bcaaba4660 remove testing only: in docker build jp 2020-03-31 22:16:36 -0400
  • c2715ed772 add imagemagick and update inherited container to alpine:3.11 jp 2020-03-31 21:31:23 -0400
  • ec5d6eef6a Merge branch 'fix/docker-mogrify' into 'develop' feld 2020-03-31 22:32:48 +0000
  • d3cd3b96bf Remove problematic --cache-from argument Mark Felder 2020-03-31 17:28:41 -0500
  • 7d3b25f0e1 Merge branch 'bugfix/funkwhale-channel' into 'develop' Haelwenn 2020-03-31 22:04:02 +0000
  • 185520d1b4
    Provide known-good user.uri, remove User.profile_url/1 Haelwenn (lanodan) Monnier 2020-03-30 02:01:09 +0200
  • b30fb1f3bb
    User: Fix use of source_data in profile_url/1 Haelwenn (lanodan) Monnier 2020-03-29 22:30:50 +0200
  • 2553400a66
    Initial failing test statement against funkwhale channels Haelwenn (lanodan) Monnier 2020-03-29 22:01:49 +0200
  • fa38089f16 Merge branch 'fix/docker-mogrify' into 'develop' feld 2020-03-31 19:36:04 +0000
  • f6dc33615b Add imagemagick to Docker image to fix broken mogrify plugin Mark Felder 2020-03-31 14:29:43 -0500
  • 219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2 Mark Felder 2020-03-31 13:05:16 -0500
  • 7408f003a6
    Use Pleroma.Formatter.linkify instead of AutoLinker.link kPherox 2020-03-31 11:13:53 +0000
  • dbf9d719f9
    split test for update profile fields kPherox 2020-04-01 00:05:13 +0900
  • c982093cc2 Transmogrifier: Fix BAD code by RINPATCH lain 2020-03-31 19:33:41 +0200
  • 1b323ce1c6 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:28:18 +0000
  • ecac57732a Transmogrifier: Only add context if it really is onne. lain 2020-03-31 19:16:45 +0200
  • 51fc504705 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-31 19:06:08 +0200
  • 288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:00:55 +0000
  • 0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 17:00:48 +0000
  • 057438a657 CommonAPI: DRY up a bit. lain 2020-03-31 17:56:05 +0200
  • aebec1bac9 Validator Test: Small refactor. lain 2020-03-31 17:47:34 +0200
  • 7af0959a07
    updating docs Alexander Strizhakov 2020-03-31 18:30:19 +0300
  • df5f89c0d6
    test for default features and changelog entry Alexander Strizhakov 2020-03-31 18:22:25 +0300
  • 643f15e77b Validators: ObjectID is an http uri. lain 2020-03-31 16:11:38 +0200
  • d191b0942f
    Remove no longer used function kPherox 2020-03-31 22:48:42 +0900
  • f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex lain 2020-03-31 12:55:25 +0000
  • e97b50d17a Merge branch 'fix-testing' into 'develop' lain 2020-03-19 18:10:39 +0000
  • a674094ec6 mix.exs bump version to 2.0.2 rinpatch 2020-03-31 14:02:51 +0300
  • 78b6549611 CHANGELOG.md: Add 2.0.2 entry rinpatch 2020-03-31 13:59:26 +0300
  • 540dd38a5e Merge branch 'docs/mrf_object_age' into 'develop' Haelwenn 2020-03-16 17:42:10 +0000
  • 0c010c292e Merge branch 'fix/ecto_ssl_option' into 'develop' rinpatch 2020-03-22 14:32:40 +0000
  • e99e2a86af Merge branch 'bugfix/profile-bio-newline' into 'develop' rinpatch 2020-03-23 19:32:01 +0000
  • c4d3ccc7b9 Merge branch 'admin-api-change-password' into 'develop' lain 2020-03-24 17:34:13 +0000
  • 10b7b2b4a4 Merge branch 'fix/activity-deletion' into 'develop' feld 2020-03-24 19:10:32 +0000
  • 0e92aa0025 Merge branch '1364-notifications-sending-control' into 'develop' rinpatch 2020-03-25 18:00:24 +0000
  • ea9c57b26e [#2332] Misc. improvements per code change requests. Ivan Tashkinov 2020-03-31 09:21:42 +0300
  • 9c94b6a327 [#2332] Misc. fixes per code change requests. Ivan Tashkinov 2020-03-30 19:08:37 +0300
  • 8bd5ad8664 Merge branch 'benchmark-improvements' into 'develop' lain 2020-03-30 14:48:00 +0000
  • dabe3aeb9e Merge branch 'removing-grouped-reports' into 'develop' rinpatch 2020-03-30 12:38:21 +0000
  • b607ae1a1c
    removing grouped reports admin api endpoint Alexander Strizhakov 2020-03-30 13:50:00 +0300
  • 1fcdcb12a7
    updating gun with bug fix Alexander Strizhakov 2020-03-30 12:47:12 +0300
  • 2afc7a9112
    changelog fix Alexander Strizhakov 2020-03-30 12:16:45 +0300
  • f497cf2f7c
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-30 12:15:23 +0300
  • 96e2796557
    use in timelines benchmark new user generator Alexander Strizhakov 2020-03-30 11:59:14 +0300
  • 56503c385e
    fix Alexander Strizhakov 2020-03-17 13:47:13 +0300
  • 1f29ecdcd7
    sync with develop Alexander Strizhakov 2020-02-18 12:19:10 +0300
  • eb9744cade
    activities generation tasks Alexander Strizhakov 2020-01-14 14:42:30 +0300
  • 931d663a3a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-03-29 20:57:38 +0100
  • e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop' Haelwenn 2020-03-29 19:18:22 +0000
  • dfd2c74184 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-03-29 06:57:34 +0300
  • be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). Ivan Tashkinov 2020-03-28 18:49:03 +0300
  • 4e81b4b190 Merge branch 'relations-preloading-for-statuses-rendering' into 'develop' lain 2020-03-27 19:14:46 +0000
  • dfbc05d496 Misc refactoring / tweaks (ThreadMute.exists?/2). Ivan Tashkinov 2020-03-27 08:01:03 +0300
  • 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering). Ivan Tashkinov 2020-03-26 21:54:01 +0300
  • 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-26 17:24:10 +0100
  • 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex lain 2020-03-26 14:45:28 +0000
  • 0c60c0a76a Validators: Use correct type for IDs. lain 2020-03-26 15:44:14 +0100
  • 0adaab8e75 Bump copyright dates. lain 2020-03-26 15:37:42 +0100
  • eaacc64839 Refactors. lain 2020-03-26 15:33:10 +0100
  • ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-26 15:24:06 +0100
  • d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex lain 2020-03-26 14:23:19 +0000
  • 4cf1007a7d ActivityPub: Small refactor. lain 2020-03-26 15:16:54 +0100
  • 94a6590e3c
    Partially restore /api/statusnet/config.json Egor Kislitsyn 2020-03-26 17:59:45 +0400